| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Fixed incompatibilities with filecache rewrite merge | Sam Tuke | 2013-01-31 | 2 | -7/+7 | |
| | * | | Merge github.com:owncloud/core | Sam Tuke | 2013-01-31 | 26 | -34/+260 | |
| | |\ \ | ||||||
| | * | | | Fixed handling of keyfile subdir creation | Sam Tuke | 2013-01-30 | 2 | -84/+24 | |
| | * | | | Working on support for deleting directories (removing all keyfiles) | Sam Tuke | 2013-01-30 | 1 | -13/+19 | |
| | * | | | Made encyrption keyfiles be deleted when their parents are | Sam Tuke | 2013-01-29 | 5 | -34/+142 | |
| | * | | | Fixed many coding guidelines issues | Sam Tuke | 2013-01-24 | 12 | -177/+282 | |
| | * | | | Work on util: findFiles() and encryptAll(); both close to working | Sam Tuke | 2013-01-23 | 9 | -181/+213 | |
| | * | | | Merge branch 'files_encryption' | Sam Tuke | 2013-01-23 | 8 | -53/+139 | |
| | |\ \ \ | ||||||
| | | * | | | Adding sharing support: added new method in Keymanager setShareKey() | Sam Tuke | 2013-01-14 | 6 | -50/+125 | |
| | | * | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-14 | 1 | -0/+6 | |
| | | |\ \ \ | ||||||
| | | * | | | | Added creation of dir for shared file env encryption keys | Sam Tuke | 2013-01-14 | 2 | -3/+14 | |
| * | | | | | | Merge branch 'master' into files_encryption-style-fixes | Sam Tuke | 2013-02-05 | 8 | -3/+78 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-05 | 1 | -0/+16 | |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-03 | 1 | -0/+4 | |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 1 | -0/+7 | |
| | | |_|_|/ | |/| | | | ||||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 2 | -0/+20 | |
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 3 | -3/+31 | |
| * | | | | | Fixed todos: undefined vars and unreachable code | Sam Tuke | 2013-02-05 | 3 | -34/+33 | |
| * | | | | | first style fixes - @samtuke: I added some TODO regarding undefined variables... | Thomas Mueller | 2013-01-30 | 2 | -455/+485 | |
| |/ / / / | ||||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-30 | 6 | -1/+48 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-29 | 1 | -0/+11 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-28 | 1 | -0/+2 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-27 | 3 | -0/+25 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-26 | 2 | -0/+14 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-25 | 3 | -0/+24 | |
| * | | | | drop SimpleTest compatibility | Thomas Mueller | 2013-01-24 | 4 | -34/+34 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-24 | 6 | -0/+55 | |
| |/ / / | ||||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-23 | 49 | -107/+59 | |
| * | | | Added localisation for encryption settings | Sam Tuke | 2013-01-22 | 2 | -27/+114 | |
| * | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 1 | -0/+6 | |
| |\ \ \ | |/ / |/| / | |/ | ||||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-11 | 1 | -0/+6 | |
| * | | Removed debugging comments | Sam Tuke | 2013-01-14 | 1 | -49/+0 | |
| * | | Removed old and unnecessary comments | Sam Tuke | 2013-01-10 | 1 | -7/+0 | |
| * | | Removed misleading crypto gen comment | Sam Tuke | 2013-01-10 | 1 | -2/+0 | |
| * | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-10 | 1 | -0/+6 | |
| |\| | ||||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-10 | 1 | -0/+6 | |
| * | | Re-added 'checkAdminUser' | Sam Tuke | 2013-01-10 | 1 | -6/+10 | |
| * | | All in-use unit tests now passing after merge | Sam Tuke | 2013-01-06 | 15 | -540/+513 | |
| * | | Removed debugging line | Sam Tuke | 2013-01-06 | 1 | -1/+1 | |
| * | | Made Keymanager::getFileKey() dependencies explicit, fixed client code and te... | Sam Tuke | 2013-01-06 | 4 | -7/+11 | |
| * | | Development snapshot | Sam Tuke | 2013-01-05 | 7 | -77/+95 | |
| * | | Development snapshot, mocking out Session{} for crypt unit tests | Sam Tuke | 2013-01-02 | 5 | -20/+35 | |
| * | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-02 | 7 | -0/+42 | |
| |\| | ||||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-31 | 2 | -2/+8 | |
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-28 | 1 | -0/+6 | |
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-27 | 1 | -0/+6 | |
| | * | Merge pull request #913 from owncloud/fix_settings | Frank Karlitschek | 2012-12-18 | 1 | -6/+6 | |
| | |\ | ||||||
| | | * | cleaning up the settings. standardize the format, add missing I10N and other ... | Frank Karlitschek | 2012-12-15 | 1 | -6/+6 | |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-18 | 1 | -0/+6 | |
| | * | | check if admin | Frank Karlitschek | 2012-12-17 | 1 | -1/+3 | |
| | |/ | ||||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |