aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* slightly widen sidebar to 250px, works better with apps and on mobileJan-Christoph Borchardt2014-06-051-1/+1
* fix position of sidebar toggle, fix Files controls position problemsJan-Christoph Borchardt2014-06-051-2/+1
* use slide toggle for files appBernhard Posselt2014-06-052-8/+2
* Merge pull request #8861 from owncloud/share-overview-linklistVincent Petry2014-06-054-2/+146
|\
| * Fixed wording to "Shared by link"Vincent Petry2014-06-042-3/+3
| * Added "Shared with link" sidebar section in files appVincent Petry2014-06-044-2/+146
* | Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-051-1/+1
|\ \
| * | adjust controls bar position for removed nav barJan-Christoph Borchardt2014-06-041-1/+1
* | | Merge pull request #8862 from owncloud/share-overview-fixmimetypeicewind19912014-06-051-4/+2
|\ \ \
| * | | Fix mime type returning for "shared with others" filesVincent Petry2014-06-041-4/+2
| | |/ | |/|
* | | Merge pull request #8852 from owncloud/kill-permissions-masterThomas Müller2014-06-055-120/+3
|\ \ \
| * | | - drop permissions table and related codeThomas Müller2014-06-055-120/+3
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-05103-48/+204
* | | Merge pull request #8724 from owncloud/update-sabre-2.0Thomas Müller2014-06-046-14/+15
|\ \ \
| * | | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-046-14/+15
| |/ /
* | | Merge pull request #8824 from owncloud/mail_template_editing_in_webuiMorris Jobke2014-06-0410-0/+457
|\ \ \
| * | | fixes during testThomas Müller2014-06-043-21/+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-0210-0/+383
* | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_sizeThomas Müller2014-06-046-117/+11
|\ \ \ \
| * | | | 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-024-86/+13
| |/ / /
* | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatusMorris Jobke2014-06-046-110/+640
|\ \ \ \
| * | | | 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-042-25/+33
| * | | | Multiple fixes to sharing overviewVincent Petry2014-06-033-36/+145
| * | | | Now using shareOwner for the share ownerVincent Petry2014-06-023-6/+12
| * | | | More unit tests and fixes for shareVincent Petry2014-06-022-125/+255
| * | | | Added unit tests for share.js and share iconVincent Petry2014-06-023-21/+229
| * | | | Update share action text to display owner/recipientsVincent Petry2014-06-023-99/+163
* | | | | remove obsolete position rule from files appJan-Christoph Borchardt2014-06-041-4/+0
| |_|/ / |/| | |
* | | | Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-044-13/+21
|\ \ \ \
| * | | | workaround to get the unit test goingThomas Müller2014-06-041-4/+6
| * | | | get the storage from the viewBjoern Schiessle2014-06-041-4/+5
| * | | | don't ask for fileInfo if we already have oneBjoern Schiessle2014-06-041-5/+4
| * | | | make sure to close the stream at the end of each testBjoern Schiessle2014-06-041-0/+6
| * | | | Continued flock work.ringmaster2014-06-041-0/+1
| * | | | flock changes. Work in progress.ringmaster2014-06-041-1/+0
| | |_|/ | |/| |
* | | | Merge pull request #8842 from owncloud/ldap_cli_methodsThomas Müller2014-06-045-1/+232
|\ \ \ \
| * | | | Fix casing and PHPDocThomas Müller2014-06-034-8/+7
| * | | | fix description textsArthur Schiwon2014-06-032-2/+2
| * | | | command line tools to see, modify and test existing LDAP configurationsArthur Schiwon2014-06-035-1/+233
* | | | | Merge pull request #8849 from owncloud/trash_expire_fixThomas Müller2014-06-041-8/+9
|\ \ \ \ \
| * | | | | fixing typoThomas Müller2014-06-041-1/+1
| * | | | | get files in trash from file cacheBjoern Schiessle2014-06-031-7/+8
* | | | | | Merge pull request #8468 from owncloud/remove-infieldlabelsJan-Christoph Borchardt2014-06-042-9/+2
|\ \ \ \ \ \
| * | | | | | infield label removal: remove last occurences of infield labelsJan-Christoph Borchardt2014-06-032-9/+2
| |/ / / / /
* | | / / / [tx-robot] updated from transifexJenkins for ownCloud2014-06-04137-319/+72
| |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 08:58:52 +0000