summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-26292-3294/+21529
|\
| * 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
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | add smart app banner to promote ios appGeorg Ehrke2013-01-252-0/+2
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2628-402/+442
| * | | | | | | | | Remove the CSP header for FirefoxLukas Reschke2013-01-251-1/+0
| * | | | | | | | | Warn users not to enable DEBUG in productive environmentsLukas Reschke2013-01-251-0/+2
| * | | | | | | | | Merge pull request #1258 from owncloud/no-inline-jsLukas Reschke2013-01-2544-1344/+16285
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use black background imagesLukas Reschke2013-01-251-1/+1
| | * | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-2581-488/+645
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1307 from owncloud/js_linkToRemoteLukas Reschke2013-01-251-0/+21
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add js linkToRemote and linkToRemoteBaseThomas Tanghus2013-01-251-0/+21
| |/ / / / / / / / /
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2532-113/+175
| * | | | | | | | | Merge pull request #1291 from owncloud/drop-simpletest-compatibility-masterLukas Reschke2013-01-2423-215/+196
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | drop SimpleTest compatibilityThomas Mueller2013-01-2423-215/+196
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #1286 from owncloud/ocs_apiThomas Müller2013-01-241-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Code style updateTom Needham2013-01-231-1/+1
| | * | | | | | | | | Check that api methods return the correct result typeTom Needham2013-01-161-0/+3
| * | | | | | | | | | Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-242-2/+18
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-2/+2
| | * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-1/+1
| | * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-0/+10
| | * | | | | | | | | | Update lib/mail.phpj-ed2013-01-221-2/+8
| * | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2434-170/+244