summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* some minor improvementsBjörn Schießle2013-01-302-4/+5
* make background transparentBjörn Schießle2013-01-301-0/+0
* improved message if trash bin is emptyBjörn Schießle2013-01-301-1/+1
* added some additional error handlingBjörn Schießle2013-01-291-11/+22
* seperate css no longer needed, use files app css insteadBjörn Schießle2013-01-292-79/+0
* icons added; empty trash bin message addedBjörn Schießle2013-01-296-8/+8
* merge conflict fixedBjörn Schießle2013-01-281-43/+0
* use hidden input field to disable sharingBjörn Schießle2013-01-281-0/+1
* fix merge conflictsBjörn Schießle2013-01-28446-8577/+30750
|\
| * Merge pull request #1318 from j-ed/masterThomas Müller2013-01-282-0/+6
| |\
| | * Update lib/mail.phpj-ed2013-01-261-0/+2
| | * Update config/config.sample.phpj-ed2013-01-261-0/+4
| * | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-2811-46/+12
| |\ \
| | * | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-266-27/+5
| | * | Remove outdated commentsLukas Reschke2013-01-263-11/+0
| | * | Fix undefined variableLukas Reschke2013-01-262-8/+7
| * | | Merge pull request #1337 from owncloud/fix-issue-780Thomas Müller2013-01-271-0/+3
| |\ \ \
| | * | | Add create permission, fixes #780Michael Gapczynski2013-01-271-0/+3
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2824-151/+187
| * | | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
| |\ \ \
| | * | | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-27165-4555/+5118
| |/ / /
| * | | Merge pull request #1320 from owncloud/implements-1316-masterLukas Reschke2013-01-261-1/+8
| |\ \ \ | | |/ / | |/| |
| | * | lookup for OCA classes in all apps foldersThomas Mueller2013-01-261-1/+8
| * | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-2615-161/+205
| |\ \ \
| | * | | replace #notification with OC.Notification callThomas Mueller2013-01-191-2/+1
| | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1922-173/+141
| | |\ \ \
| | * | | | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-192-4/+15
| | * | | | 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-18763-8788/+8108
| | |\ \ \ \
| | * | | | | relative storage info without decimalsThomas Mueller2013-01-171-1/+1
| | * | | | | rename space -> storageThomas Mueller2013-01-171-1/+1
| | * | | | | pin notification to the topThomas Mueller2013-01-111-1/+1
| | * | | | | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-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-115-7/+8
| | * | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-11275-5553/+8278
| | |\ \ \ \ \
| | * | | | | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1
| | * | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-6/+16
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0627-558/+1043
| | |\ \ \ \ \ \ \
| | * | | | | | | | js optimisations and style fixesThomas Mueller2013-01-061-15/+16
| | * | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-06168-3312/+6177
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | javascript syntax error fixed on the wayThomas Mueller2013-01-041-3/+3
| | * | | | | | | | | new javascript notification functions used within users.jsThomas Mueller2013-01-041-5/+4
| | * | | | | | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-043-43/+52
| | * | | | | | | | | 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
| | * | | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-022-12/+23
| * | | | | | | | | | Merge pull request #1306 from owncloud/smart-app-bannerThomas Müller2013-01-262-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |