summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Return unencrypted_size of folder when queriedVincent Petry2014-03-074-0/+48
* Propagate unencrypted_size up to the file cache rootVincent Petry2014-03-071-2/+7
* Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-064-500/+641
|\
| * Fixed upload issue when free space is not knownVincent Petry2014-03-062-2/+4
| * Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
| * Added testArea for JS Unit testsVincent Petry2014-03-061-0/+7
* | Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fixVincent Petry2014-03-061-4/+3
|\ \
| * | Fix imagerotate and move loadFromBase64() one up.kondou2014-02-121-4/+3
* | | Revert "adding new javascript function OC.generateUrl(url, params)"Morris Jobke2014-03-061-24/+0
* | | Merge pull request #7579 from owncloud/introduce-generateUrl-masterMorris Jobke2014-03-062-0/+33
|\ \ \
| * | | adding js unit tests for OC.generateUrl()Thomas Müller2014-03-061-0/+9
| * | | adding new javascript function OC.generateUrl(url, params)Thomas Müller2014-03-061-0/+24
| | |/ | |/|
* | | Merge pull request #7494 from owncloud/fix-7307Vincent Petry2014-03-0617-179/+82
|\ \ \
| * | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0647-229/+480
| |\| |
| * | | Removed obsolete OC.Router stubs in specHelperVincent Petry2014-03-051-10/+0
| * | | fixing js unit testsThomas Müller2014-03-053-11/+5
| * | | remove OC.Router.registerLoadedCallback()Thomas Müller2014-03-021-3/+1
| * | | fixing download url in files appThomas Müller2014-03-021-1/+1
| * | | adding JSDoc + remove unused functionThomas Müller2014-03-021-5/+8
| * | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-0214-154/+72
* | | | Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4Vincent Petry2014-03-063-62/+80
|\ \ \ \
| * \ \ \ fix merge conflictsGeorg Ehrke2014-03-0617-53/+93
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi...Georg Ehrke2014-03-053-62/+80
* | | | | Merge pull request #7588 from owncloud/noise-repeatVincent Petry2014-03-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix noise not repeatingJan-Christoph Borchardt2014-03-061-1/+1
|/ / / /
* | | | Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
|\ \ \ \
| * | | | Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
* | | | | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-055-7/+7
|\ \ \ \ \
| * | | | | Use 'command -v' to detect whether and where software is installed (instead o...Philipp Schmitt2014-02-215-7/+7
* | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-057-28/+66
|\ \ \ \ \ \
| * | | | | | don't allow to create a file or folder named 'Shared' in the root folder, als...Bjoern Schiessle2014-03-057-28/+66
* | | | | | | Merge pull request #7569 from owncloud/scrutinizer-tabsJan-Christoph Borchardt2014-03-053-16/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-053-16/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7568 from owncloud/lib_preview_add_fcloseMorris Jobke2014-03-051-0/+1
|\ \ \ \ \ \
| * | | | | | add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918Georg Ehrke2014-03-051-0/+1
| |/ / / / /
* | | | | | Merge pull request #7566 from owncloud/button-outlinesMorris Jobke2014-03-051-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds 0 Outlines to Buttonsraghunayyar2014-03-051-0/+1
* | | | | | Merge pull request #7558 from owncloud/fix_issue_loading_cached_thumbMorris Jobke2014-03-051-1/+3
|\ \ \ \ \ \
| * | | | | | fix issue with spamming logging files when loading cached thumbnailGeorg Ehrke2014-03-051-1/+3
* | | | | | | Merge pull request #7560 from owncloud/icons.css-star-fixRaghu Nayyar2014-03-051-2/+6
|\ \ \ \ \ \ \
| * | | | | | | add hover/focus states for star icons to hint at actionJan-Christoph Borchardt2014-03-051-2/+6
* | | | | | | | Merge pull request #7261 from owncloud/issue/6793Jan-Christoph Borchardt2014-03-055-13/+74
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow admins to disable certain external storages for usersJoas Schilling2014-02-265-13/+74
* | | | | | | | Merge pull request #7556 from owncloud/enc_dont_create_files_folderVincent Petry2014-03-051-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #7412 from owncloud/issue/7175Joas Schilling2014-03-054-3/+48
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add button to send a test mail after changing the email settingsJoas Schilling2014-03-054-3/+48
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7012 from owncloud/display-share-owner-masterVincent Petry2014-03-054-13/+30
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-28103-766/+1851
| |\ \ \ \ \ \
| * | | | | | | Improve jQuery element selectorMorris Jobke2014-02-201-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 06:26:56 +0000