Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #1

Open
wants to merge 202 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
ce00816
ml parser, performance
mschultheiss May 2, 2013
f10e7ec
logout working now, removed log function in stream_get
mschultheiss May 3, 2013
2ec51b4
search page
mschultheiss May 3, 2013
56fb89e
some bugfixes
mschultheiss May 4, 2013
fd50326
encrypted fileupload for messages, bugfixes
mschultheiss May 7, 2013
4c7a10c
image encryption
mschultheiss May 8, 2013
0616f1c
resize message images
mschultheiss May 8, 2013
7e03c94
likes, notifications
mschultheiss May 11, 2013
5e2ba6b
conversations
mschultheiss May 14, 2013
304aac2
graph visualizer, messages, show media
mschultheiss May 17, 2013
093cf98
show media
mschultheiss May 22, 2013
a6c7611
basic smilie support
mschultheiss May 23, 2013
fcc7dd9
emoticons , android
mschultheiss May 27, 2013
d4ab3e7
android
mschultheiss May 27, 2013
34caeae
android, stream images, notifications
mschultheiss May 31, 2013
49a6db5
changed image size
mschultheiss May 31, 2013
fbec507
android
mschultheiss Jun 2, 2013
6c8124b
format fixed
mschultheiss Jun 2, 2013
a823630
Added Rhino for Android
mschultheiss Jun 6, 2013
4522e75
delete comment/post function
mschultheiss Jun 10, 2013
cf0ddd9
Android
Aug 20, 2013
f283020
Update readme.md
mschultheiss Aug 20, 2013
ea99270
Android, Changed AES Lib
Aug 21, 2013
4d81c54
Android,AES Bugfixes
mschultheiss Aug 22, 2013
2326b75
updated keymanager
mschultheiss Aug 25, 2013
1c9f259
keymananger
mschultheiss Aug 30, 2013
3265b76
keymanager
mschultheiss Sep 7, 2013
d7a0c1b
merge
mschultheiss Sep 7, 2013
9456854
keymanager
mschultheiss Sep 11, 2013
73ddd61
Multiserver support
Sep 17, 2013
b29eadc
Changed License to GPLv3, private information
mschultheiss Oct 5, 2013
22760ff
added missing files
mschultheiss Oct 5, 2013
f737ec7
removed readme duplicates
mschultheiss Oct 5, 2013
159c641
private profile
mschultheiss Oct 6, 2013
047f472
private profile
mschultheiss Oct 9, 2013
6c04127
Private Profile
mschultheiss Oct 15, 2013
421a25d
private info, public key fingerprints
mschultheiss Oct 19, 2013
629f0fa
private info
mschultheiss Oct 20, 2013
81455ff
Private info
mschultheiss Oct 22, 2013
168b32f
smilie cursor position@insert fixed
mschultheiss Oct 22, 2013
85f8387
smilie cursor position fixed again
mschultheiss Oct 22, 2013
1fdb7a0
redesigned messages, rsa caching
mschultheiss Oct 22, 2013
1b3df28
pieces: added versions for caching
mschultheiss Oct 22, 2013
56d1f61
fixed post collection selector
mschultheiss Oct 22, 2013
00ce0fa
added messages auto refresh
mschultheiss Oct 24, 2013
4870fd8
aes image decryption fixed
mschultheiss Oct 24, 2013
3c51b73
real names in messages
mschultheiss Oct 24, 2013
7b9cb26
likes fixed
mschultheiss Oct 24, 2013
b6c5d99
all
mschultheiss Nov 2, 2013
9327f66
do not allow to request empty profiles
mschultheiss Nov 4, 2013
be429b6
added random salt to keyring
mschultheiss Nov 4, 2013
c137162
key dir revisions, key update
mschultheiss Nov 7, 2013
a1c3bb9
added screenshots
mschultheiss Nov 9, 2013
eac5f2e
readme update
mschultheiss Nov 9, 2013
76dab98
Merge branch 'dev'
mschultheiss Nov 9, 2013
ffa298c
added qr code
mschultheiss Nov 25, 2013
a3573ec
some small fixes, refactoring
mschultheiss Jan 2, 2014
6806554
added missing files
mschultheiss Jan 2, 2014
93e26e8
some refactoring, new message button in sidebar
mschultheiss Jan 2, 2014
604cb8b
added list filter to stream
mschultheiss Jan 3, 2014
f7c75ef
removed log file
mschultheiss Jan 3, 2014
dd46d4e
key check for talks, many bugfixes, new logo
mschultheiss Feb 13, 2014
3720378
new message system
mschultheiss Feb 15, 2014
e4c95ba
improved add people to messages
mschultheiss Feb 17, 2014
1adc9db
added signature function
mschultheiss Feb 20, 2014
412d594
added signature function
mschultheiss Feb 20, 2014
a1ef9b3
zip download, key verification on profile
mschultheiss Feb 20, 2014
644b6dd
merge
mschultheiss Feb 20, 2014
b03eeeb
android aes support
mschultheiss Feb 20, 2014
784cacd
android app
mschultheiss Feb 21, 2014
c225d8f
android pagination fo messages
mschultheiss Feb 24, 2014
2da0b1c
android
mschultheiss Feb 28, 2014
c713484
various improvments
mschultheiss Mar 21, 2014
3e5ec78
android, zip download, gcm
mschultheiss Mar 31, 2014
44eef05
Merge branch 'dev'
mschultheiss Mar 31, 2014
69ce815
added missing files
mschultheiss Mar 31, 2014
e13ac4f
Merge branch 'dev'
mschultheiss Mar 31, 2014
c4e6407
description
mschultheiss Mar 31, 2014
93f0194
updated security description
mschultheiss Apr 3, 2014
992b343
revision counter popup
mschultheiss Apr 5, 2014
9dc5494
image decryption in extra thread
mschultheiss Apr 7, 2014
5156351
timeout for json requests
mschultheiss Apr 7, 2014
1e0c310
update key directory recrypt
mschultheiss Apr 8, 2014
373db68
signatures
mschultheiss May 4, 2014
ddc65cb
signature dictionary
mschultheiss May 4, 2014
a95f67a
added missing files
mschultheiss May 4, 2014
cd8cf24
change password functionality
mschultheiss May 17, 2014
baab1ae
added password manager
mschultheiss May 18, 2014
4c93fea
pthreads
mschultheiss May 20, 2014
9758b51
added gearman examples
mschultheiss May 20, 2014
6fed4bf
gearman message server improvments
mschultheiss May 31, 2014
14409c7
added missing files
mschultheiss May 31, 2014
0d7c3e8
splitted ui libraries
mschultheiss Jun 3, 2014
1fe57d6
fixed server to server requests, added testsuite
mschultheiss Jun 7, 2014
df2fa35
improved test suite
mschultheiss Jun 7, 2014
313c553
comment delete
mschultheiss Jun 10, 2014
ebb6a7b
responsive mode
mschultheiss Jun 14, 2014
ed71479
missing files
mschultheiss Jun 14, 2014
d5838b7
missing files
mschultheiss Jun 14, 2014
86f6c89
keymng, collections encrypted
mschultheiss Sep 16, 2014
d7fbc8e
readme update
mschultheiss Sep 16, 2014
18602de
minor bugfixes
mschultheiss Sep 17, 2014
d2b2a8f
minor fixes
mschultheiss Sep 18, 2014
1eaa397
bugfix
mschultheiss Oct 23, 2014
ab49f69
bugfix
mschultheiss Oct 23, 2014
0a0742a
bugfix
mschultheiss Oct 23, 2014
0c9c22f
bugfix
mschultheiss Oct 23, 2014
4a416de
animation
mschultheiss Nov 12, 2014
5e4f772
some android changes
mschultheiss Jan 9, 2015
4e4954e
some android updates, documentation and bugfixes
Feb 23, 2015
2a19268
readme update
mschultheiss Feb 23, 2015
5c4b18d
moved android files& updated js
mschultheiss Apr 15, 2015
8b4779d
some refactoring and documentation
mschultheiss May 8, 2015
ee1a793
new install script
mschultheiss May 18, 2015
3c5c73d
missing files
mschultheiss May 18, 2015
f0973af
some refactoring
mschultheiss May 31, 2015
89d83c8
comments delete, cross domain search, minor improvments
mschultheiss Jun 23, 2015
51b003b
minor fix
mschultheiss Jun 23, 2015
d496b2a
multi server fix
mschultheiss Jun 23, 2015
caa536e
comment fix
mschultheiss Jun 23, 2015
290ff5a
comment fix
mschultheiss Jun 23, 2015
ee5e2ff
mulitserver fix
mschultheiss Jun 26, 2015
15c002e
added cordova
mschultheiss Jul 23, 2015
10770ac
more corodva
mschultheiss Jul 23, 2015
142331e
some new files
mschultheiss Jul 27, 2015
c838e9f
readme fix
mschultheiss Jul 27, 2015
9bbb311
readme fix
mschultheiss Jul 27, 2015
9f91da4
file update
mschultheiss Jul 27, 2015
ad6821c
file update
mschultheiss Jul 27, 2015
6103e90
some fixes and repsonsive search
mschultheiss Aug 8, 2015
cefb970
hmac bugfix
mschultheiss Aug 10, 2015
eee4876
key update and hmac stuff
mschultheiss Sep 9, 2015
7c9edb6
charme android improvements
mschultheiss Oct 8, 2015
a3beef4
fixed setup script for debian
mschultheiss Oct 21, 2015
21b7b8e
Android App, Documentation and Refactoring
mschultheiss Oct 22, 2015
ed39d6f
Deleted old files, hmac generation improved and some documentation
mschultheiss Oct 23, 2015
8bd3cce
tex protocol
mschultheiss Oct 23, 2015
8db3115
refactoring and documentation
mschultheiss Oct 25, 2015
2d0804f
integrity protection for userId/name pairs, documentation etc.
mschultheiss Oct 29, 2015
13df00d
user data like name etc. integrity protected
mschultheiss Oct 30, 2015
dcf8b0d
removed strange laughing comment
mschultheiss Oct 30, 2015
26cf46d
setup script and message refactoring
Nov 5, 2015
baca4ff
fixed and refactored add people to conversation
Nov 10, 2015
b455e32
passphrase fix after user change
mschultheiss Nov 10, 2015
b760909
fixed username search and logout
mschultheiss Nov 12, 2015
706ea87
new context items
mschultheiss Nov 12, 2015
fead0ce
android app and server clustering bugfix
mschultheiss Nov 13, 2015
5d10e31
push notifications bugfix
mschultheiss Nov 13, 2015
e129c25
fixed cross server context search
mschultheiss Nov 13, 2015
2e2bf68
android: ringtones, message sending indicator, message signature perf…
mschultheiss Nov 15, 2015
fb7021e
fixed time and preview update on server
mschultheiss Nov 17, 2015
c209f1d
push notification websockets fixed after login
mschultheiss Nov 17, 2015
6b89da7
edgekey fix and readme update
mschultheiss Nov 18, 2015
2b04246
Context encryption bugfix
mschultheiss Nov 18, 2015
7af820b
fixed list names
mschultheiss Nov 18, 2015
89bf230
removed alert
mschultheiss Nov 18, 2015
e345c56
pagination bug
mschultheiss Nov 19, 2015
bd5b877
small tex changes
mschultheiss Nov 20, 2015
567b663
collections deleteable, deletion security, refactoring
mschultheiss Dec 5, 2015
a454aa3
added more context, optional properties
mschultheiss Dec 9, 2015
5293e0a
reuqired context properties
mschultheiss Dec 9, 2015
eba39fb
location manager
mschultheiss Dec 10, 2015
8d1b514
some refactoring and removed word infamous (i thought it meant 'not f…
mschultheiss Dec 11, 2015
8bf0a9d
only context from myself in stream per default
mschultheiss Dec 11, 2015
87e57b1
default collections and lists, android app
mschultheiss Dec 13, 2015
fd9b5a2
bugfixes
mschultheiss Dec 17, 2015
e7f6b40
small fix
mschultheiss Dec 18, 2015
f3b1204
demo
mschultheiss Dec 18, 2015
4946783
default config fix
mschultheiss Dec 18, 2015
1cb7d59
https
mschultheiss Dec 18, 2015
54e5c53
about page fix
mschultheiss Dec 18, 2015
465c66d
wording
mschultheiss Dec 18, 2015
6b4b8bb
layout
mschultheiss Dec 18, 2015
a0c1b80
droped https for client as non https servers are not allowed otherwise
mschultheiss Dec 18, 2015
84cc44c
passphrase fix
mschultheiss Dec 19, 2015
68da9e9
tex and moved files
mschultheiss Dec 19, 2015
c8eb501
paper updated
mschultheiss Dec 20, 2015
58353d3
linkfix
mschultheiss Dec 20, 2015
72475af
paper update
mschultheiss Dec 24, 2015
b3eacec
tex and minor bugfixes
mschultheiss Dec 27, 2015
0fb0c03
readme update
mschultheiss Dec 28, 2015
0f9fe7c
user already exists message
mschultheiss Dec 30, 2015
aa59166
small tex fix
mschultheiss Jan 2, 2016
f2e5d5d
css fix
mschultheiss Jan 2, 2016
8a8815a
minor fixes
mschultheiss Jan 6, 2016
5cf26c0
setup and background task bugfixes
mschultheiss Jan 6, 2016
3fb3a10
install fix
mschultheiss Jan 6, 2016
39b57b7
install fix
mschultheiss Jan 6, 2016
6387290
install fix
mschultheiss Jan 6, 2016
289c939
install fix
mschultheiss Jan 6, 2016
8f9e274
rachet fix
mschultheiss Jan 6, 2016
e2cbf75
rachet update
invalid-email-address Jan 6, 2016
93c8d2c
terms of use url
mschultheiss Jan 8, 2016
e3d3216
readme update
mschultheiss Jan 8, 2016
26e609c
readme update
mschultheiss Jan 8, 2016
c1f8271
readme update
mschultheiss Jan 8, 2016
cfa2c7f
readme update
mschultheiss Jan 8, 2016
ed100cf
readme update
mschultheiss Jan 8, 2016
7729a8f
readme update
mschultheiss Jan 8, 2016
209cded
readme update
mschultheiss Jan 8, 2016
bd015c9
Spelling fix
daniellockard Jan 9, 2016
7634cd8
Merge pull request #8 from daniellockard/patch-1
mschultheiss Jan 9, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 25 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*~

#/web/*
/dev/*
/web/phpdoc/*
Expand All @@ -6,15 +8,26 @@
/web/doxygen/doxyindexer.exe
/robodoc.exe
/server/mongodb.php
/server/charme/config.php
/server/charme/log.txt
/server/charme/config
/server/charme/config/*
/server/charme/admin/log.txt
/server/charme/admin/nohup.out
/cordova/charmesocial/www/*
/cordova/charmesocial/*
/cordova/platforms/*

/temp/*
/old/*
/doxygen/*

*.sublime-workspace
*.sublime-project
#################
## Eclipse
#################


*.pydevproject
.project
.metadata
Expand All @@ -41,6 +54,17 @@ local.properties
# PDT-specific
.buildpath

###
## TEX
###
doc/tex/*.bbl
doc/tex/*.blg
doc/tex/*.run.xml
doc/tex/main-blx.bib
doc/tex/*.aux
doc/tex/*.log
doc/tex/*.out
doc/tex/main.synctex.gz

#################
## Visual Studio
Expand Down
15 changes: 15 additions & 0 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Charme is a distributed social network with end-to-end encryption
Copyright (C) 2014 Manuel Schultheiß

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
24 changes: 24 additions & 0 deletions Cakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Cakefile for Charme, taken and modfied from gist.github.com/haihappen/2243795
option '-o', '--output [DIR]', '' # output directory
task 'sbuild', '', (options) -> # new build task

exec = require('child_process').exec
filesystem = require('fs')

Array::remove = (e) -> @[t..t] = [] if (t = @indexOf(e)) > -1
Array::include = (e) -> @indexOf(e) > -1

settings =
input: ['jsclient/src/schema.coffee','jsclient/src/listOperations.coffee','jsclient/src/post.coffee','jsclient/src/log.coffee', 'jsclient/src/simpleStorage.coffee', 'jsclient/src/signature.coffee', 'jsclient/src/keys.coffee', 'jsclient/src/views.coffee', 'jsclient/src/context.coffee'] # add folder with 'app' for example
output: 'jsclient/src/models.js'
_files: (dir) ->
unless dir?
while (settings._files(file) for file in @input when filesystem.lstatSync(file).isDirectory()).length > 0 then
file for file in @input when file.match(/\.coffee$/)
else
@input.remove(dir)
@input.push(file) for file in filesystem.readdirSync(dir) when (file = "#{dir}/#{file}") and not @input.include(file)
input = settings._files().join(' ')
exec("coffee -j #{settings.output} -cw #{input}").stdout.on 'data', (data) ->
process.stdout.write(data)

674 changes: 674 additions & 0 deletions LICENSE.txt

Large diffs are not rendered by default.

25 changes: 0 additions & 25 deletions android/charme/AndroidManifest.xml

This file was deleted.

6 changes: 0 additions & 6 deletions android/charme/gen/com/example/charme/BuildConfig.java

This file was deleted.

35 changes: 0 additions & 35 deletions android/charme/gen/com/example/charme/R.java

This file was deleted.

Binary file removed android/charme/ic_launcher-web.png
Binary file not shown.
Binary file removed android/charme/libs/android-support-v4.jar
Binary file not shown.
20 changes: 0 additions & 20 deletions android/charme/proguard-project.txt

This file was deleted.

14 changes: 0 additions & 14 deletions android/charme/project.properties

This file was deleted.

Binary file not shown.
Binary file removed android/charme/res/drawable-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed android/charme/res/drawable-ldpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed android/charme/res/drawable-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed android/charme/res/drawable-xhdpi/ic_launcher.png
Binary file not shown.
14 changes: 0 additions & 14 deletions android/charme/res/layout/activity_main.xml

This file was deleted.

6 changes: 0 additions & 6 deletions android/charme/res/menu/activity_main.xml

This file was deleted.

5 changes: 0 additions & 5 deletions android/charme/res/values-v11/styles.xml

This file was deleted.

5 changes: 0 additions & 5 deletions android/charme/res/values-v14/styles.xml

This file was deleted.

8 changes: 0 additions & 8 deletions android/charme/res/values/strings.xml

This file was deleted.

5 changes: 0 additions & 5 deletions android/charme/res/values/styles.xml

This file was deleted.

20 changes: 0 additions & 20 deletions android/charme/src/com/example/charme/MainActivity.java

This file was deleted.

74 changes: 0 additions & 74 deletions android/cryptoTest/cryptoTest/build.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions android/cryptoTest/cryptoTest/manifest.mf

This file was deleted.

Loading