summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3014-3/+48
|\
| * Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10Thomas Müller2013-01-301-0/+4
| |\
| | * hide upload progress bar and cancel action in IE < 10Jörn Friedrich Dreyer2013-01-181-0/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-306-0/+26
| * | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-281-1/+1
| |\ \
| | * | fix color change on clickJan-Christoph Borchardt2013-01-281-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-296-2/+17
| |/ /
* | | merge stylesJan-Christoph Borchardt2013-01-2872-298/+396
|\| |
| * | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-287-36/+3
| |\ \
| | * | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-264-25/+3
| | * | 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-284-0/+13
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2758-87/+86
| |/ /
| * | 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-193-56/+10
| | |\ \
| | * | | 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-1822-148/+335
| | |\ \ \
| | * | | | 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-1153-143/+292
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-6/+16
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0646-11/+118
| | |\ \ \ \ \ \
| | * | | | | | | 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-261-0/+2
| * | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-254-0/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-252-0/+10
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-242-0/+2
| * | | | | | | | | Merge master...Lukas Reschke2013-01-239-0/+28
| |\| | | | | | | |
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-239-0/+28
| * | | | | | | | | rename 'publicListView' switch to 'disableSharing' because this is not only u...Björn Schießle2013-01-221-3/+3
| * | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-2258-109/+87
| |\| | | | | | | |
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-219-0/+18
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2058-109/+69
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Remove closing tagLukas Reschke2013-01-211-1/+0
| * | | | | | | | No inline JS in appsLukas Reschke2013-01-213-8/+26
| |/ / / / / / /
| * | | | | | | Merge pull request #1230 from owncloud/remove-unused-autocomplete.phpLukas Reschke2013-01-191-54/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove uneeded fileLukas Reschke2013-01-181-54/+0
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #1228 from owncloud/generating_zip_messageJan-Christoph Borchardt2013-01-191-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Change the second part of the notificationLukas Reschke2013-01-191-1/+1
| | * | | | | | | Make the message friendlierLukas Reschke2013-01-181-1/+1
| | |/ / / / / /
| * | | | | | / [tx-robot] updated from transifexJenkins for ownCloud2013-01-191-1/+9
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-186-14/+142
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |