summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsBjörn Schießle2013-01-28170-1133/+4649
|\
| * Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-289-38/+5
| |\
| | * Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-266-27/+5
| | * Remove outdated commentsLukas Reschke2013-01-263-11/+0
| * | Add create permission, fixes #780Michael Gapczynski2013-01-271-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-285-0/+15
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2766-88/+131
| |/
| * Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-268-128/+125
| |\
| | * replace #notification with OC.Notification callThomas Mueller2013-01-191-2/+1
| | * Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-195-57/+17
| | |\
| | * | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-191-2/+10
| | * | introducing class OCA/files/lib/Helper with new function to build an array wi...Thomas Mueller2013-01-194-76/+63
| | * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-18152-683/+875
| | |\ \
| | * | | relative storage info without decimalsThomas Mueller2013-01-171-1/+1
| | * | | rename space -> storageThomas Mueller2013-01-171-1/+1
| | * | | fixing indent - sorryy wrong setting on the IDE :-(Thomas Mueller2013-01-111-17/+15
| | * | | adding accidentally removed line - THX @bartv2Thomas Mueller2013-01-111-0/+1
| | * | | displaying notification now centeredThomas Mueller2013-01-111-1/+0
| | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1171-171/+452
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-6/+16
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-061-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0651-11/+139
| | |\ \ \ \ \ \
| | * | | | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-042-43/+22
| | * | | | | | | notifications are now shown/hidden using the js functions hideNotification an...Thomas Mueller2013-01-022-38/+60
| | * | | | | | | make usedSpacePercent available in the files appThomas Mueller2013-01-022-0/+5
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-264-0/+20
| * | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-2523-44/+146
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-259-5/+47
| | * | | | | | | | drop SimpleTest compatibilityThomas Mueller2013-01-246-39/+39
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-249-0/+60
| * | | | | | | | | Merge master...Lukas Reschke2013-01-2394-888/+4201
| |\| | | | | | | |
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2364-110/+107
| | * | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-22195-570/+633
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Added localisation for encryption settingsSam Tuke2013-01-222-27/+114
| | * | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-2235-319/+547
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Removed debugging commentsSam Tuke2013-01-141-49/+0
| | * | | | | | | | | | Removed old and unnecessary commentsSam Tuke2013-01-101-7/+0
| | * | | | | | | | | | Removed misleading crypto gen commentSam Tuke2013-01-101-2/+0
| | * | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-1064-120/+255
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Re-added 'checkAdminUser'Sam Tuke2013-01-101-6/+10
| | * | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-063-6/+18
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | All in-use unit tests now passing after mergeSam Tuke2013-01-0615-540/+513
| | * | | | | | | | | | | Removed debugging lineSam Tuke2013-01-061-1/+1
| | * | | | | | | | | | | Made Keymanager::getFileKey() dependencies explicit, fixed client code and te...Sam Tuke2013-01-064-7/+11
| | * | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-0552-12/+140
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Development snapshotSam Tuke2013-01-057-77/+95
| | * | | | | | | | | | | Development snapshot, mocking out Session{} for crypt unit testsSam Tuke2013-01-025-20/+35
| | * | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-02155-240/+905
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2012-12-12251-2171/+4062
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Improved formatting of getPublicKeys()Sam Tuke2012-12-111-7/+36
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 19:57:11 +0000