summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove file locking - code will continue to live in it's own appThomas Müller2014-06-044-564/+0
* Merge pull request #8824 from owncloud/mail_template_editing_in_webuiMorris Jobke2014-06-0410-0/+457
|\
| * fixes during testThomas Müller2014-06-044-59/+32
| * convert mail template editor to app framework for a restful apiJörn Friedrich Dreyer2014-06-0313-141/+204
| * minimal mail template editor for administrators, refs #7177Jörn Friedrich Dreyer2014-06-0211-0/+421
* | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_sizeThomas Müller2014-06-047-118/+12
|\ \
| * | Fix merge conflictThomas Müller2014-06-031-31/+0
| * | use OC_DB::dropTable()Thomas Müller2014-06-022-4/+2
| * | return size '0' if the trashbin folder doesn't exists yetBjoern Schiessle2014-06-021-2/+2
| * | let file cache handle the versions sizeBjoern Schiessle2014-06-025-87/+14
* | | Merge pull request #8876 from owncloud/design-css-settingsMorris Jobke2014-06-041-4/+7
|\ \ \
| * | | personal settings: unbold clients header and remove obsolete CSSJan-Christoph Borchardt2014-06-041-4/+7
* | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatusMorris Jobke2014-06-0411-169/+901
|\ \ \ \
| * | | | Do not update action icon recipients for file listVincent Petry2014-06-041-0/+5
| * | | | Use recipient display names when updating shares in the UIVincent Petry2014-06-044-52/+85
| * | | | Multiple fixes to sharing overviewVincent Petry2014-06-034-41/+150
| * | | | Now using shareOwner for the share ownerVincent Petry2014-06-023-6/+12
| * | | | More unit tests and fixes for shareVincent Petry2014-06-024-140/+421
| * | | | change shared folder icon to use share icon instead of peopleJan-Christoph Borchardt2014-06-022-20/+24
| * | | | Added unit tests for share.js and share iconVincent Petry2014-06-025-35/+234
| * | | | Update share action text to display owner/recipientsVincent Petry2014-06-024-131/+226
* | | | | Merge pull request #8875 from owncloud/app-css-relativeJan-Christoph Borchardt2014-06-042-4/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remove obsolete position rule from files appJan-Christoph Borchardt2014-06-041-4/+0
| * | | | explicit position:relative for app-content, fixes first run layoutJan-Christoph Borchardt2014-06-041-0/+1
|/ / / /
* | | | Merge pull request #8822 from owncloud/cache-change-propagatorVincent Petry2014-06-047-68/+320
|\ \ \ \
| * | | | Fix unit testsRobin Appelman2014-06-042-12/+10
| * | | | Fix size calculation during recursive scanRobin Appelman2014-06-031-7/+3
| * | | | Fix unit testsRobin Appelman2014-06-032-13/+19
| * | | | Fix recursive scanningRobin Appelman2014-06-021-3/+5
| * | | | propagate changes in the scannerRobin Appelman2014-06-023-1/+77
| * | | | Split of cache writes in the scanner to their own methodsRobin Appelman2014-06-021-39/+43
| * | | | Add a change propagator class to handle propagating etag and mtime changesRobin Appelman2014-06-022-0/+170
* | | | | Merge pull request #8844 from owncloud/design-iconsMorris Jobke2014-06-044-12/+130
|\ \ \ \ \
| * | | | | simplify logout and caret icons, remove shadowJan-Christoph Borchardt2014-06-034-12/+130
* | | | | | Merge pull request #8701 from owncloud/slide-up-toggleBernhard Posselt2014-06-042-0/+77
|\ \ \ \ \ \
| * | | | | | disable dynamic slide toggle by default and offer a way to enable itBernhard Posselt2014-05-261-3/+15
| * | | | | | rename to apps.jsBernhard Posselt2014-05-262-1/+1
| * | | | | | query buttons on every click to not worry about weird edge case scenariosBernhard Posselt2014-05-241-19/+5
| * | | | | | use different nsBernhard Posselt2014-05-241-1/+1
| * | | | | | allow apps to add buttons on runtime without negatively impacting performanceBernhard Posselt2014-05-241-4/+17
| * | | | | | add ; to make jshint happyBernhard Posselt2014-05-231-1/+1
| * | | | | | remove unecessary parenthsBernhard Posselt2014-05-231-2/+2
| * | | | | | add a slideup mechanismBernhard Posselt2014-05-232-0/+66
* | | | | | | Merge pull request #8853 from owncloud/design-typefaceJan-Christoph Borchardt2014-06-048-3/+236
|\ \ \ \ \ \ \
| * | | | | | | IE -> IE8 onlyMorris Jobke2014-06-041-1/+1
| * | | | | | | move from tff to woff and fix IE8Morris Jobke2014-06-047-6/+14
| * | | | | | | unbold the usernameJan-Christoph Borchardt2014-06-031-1/+0
| * | | | | | | do not use italic typeface style, instead lighter colorJan-Christoph Borchardt2014-06-031-0/+9
| * | | | | | | use Open Sans as typefaceJan-Christoph Borchardt2014-06-036-1/+218
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #8860 from owncloud/phpstorm-code-styleMorris Jobke2014-06-041-0/+51
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 11:39:53 +0000