summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-08-2658-6/+656
|
* Merge pull request #18569 from owncloud/files-dropdown-borderRaghu Nayyar2015-08-261-1/+1
|\ | | | | adjust dropdown borders to button borders
| * adjust dropdown borders to button bordersChristoph Wurst2015-08-251-1/+1
| |
* | Merge pull request #18553 from owncloud/write-l10n-on-loginThomas Müller2015-08-261-4/+12
|\ \ | | | | | | Save detected l10n of browser on login
| * | Save detected l10n of browser on loginMorris Jobke2015-08-251-4/+12
| | | | | | | | | | | | * fixes owncloud/activity#373
* | | Merge pull request #17662 from owncloud/locking-dbThomas Müller2015-08-2610-43/+446
|\ \ \ | | | | | | | | Database backend for locking
| * | | Adding path to log messageThomas Müller2015-08-251-1/+1
| | | |
| * | | log a warning while trying to acquire a db lock from within a transactionRobin Appelman2015-08-103-6/+18
| | | |
| * | | add method to check if we're inside a transactionRobin Appelman2015-08-103-0/+27
| | | |
| * | | cleanup empty locksRobin Appelman2015-08-101-0/+14
| | | |
| * | | more phpdocRobin Appelman2015-08-031-1/+1
| | | |
| * | | more phpdocRobin Appelman2015-08-031-1/+9
| | | |
| * | | rename path field to keyRobin Appelman2015-08-032-12/+18
| | | |
| * | | initialize unused (for now) ttl field to 0Robin Appelman2015-08-031-1/+1
| | | |
| * | | Fix db schemaRobin Appelman2015-08-035-12/+44
| | | |
| * | | use the database backend for locking if no memcache is configured for itRobin Appelman2015-08-031-4/+2
| | | |
| * | | Add database backend for high level lockingRobin Appelman2015-08-035-2/+214
| | | |
| * | | split off keeping track of acquire locksRobin Appelman2015-08-033-36/+130
| | | |
* | | | Merge pull request #18522 from owncloud/lighter-fontsMorris Jobke2015-08-256-12/+13
|\ \ \ \ | |_|_|/ |/| | | move fonts from Regular+Bold to Light+Semibold for lighter feel
| * | | move fonts from Regular+Bold to Light+Semibold for lighter feelJan-Christoph Borchardt2015-08-256-12/+13
| | | |
* | | | Merge pull request #18562 from owncloud/explicit-use-statuscode-200Morris Jobke2015-08-252-0/+5
|\ \ \ \ | | | | | | | | | | Explicitly specify status code 200 as response code
| * | | | Explicitly specify status code 200 as response codeLukas Reschke2015-08-252-0/+5
| | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/17586
* | | | | Merge pull request #18564 from owncloud/fix-transifex-syncMorris Jobke2015-08-25779-4815/+7273
|\ \ \ \ \ | | | | | | | | | | | | Update slug
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-25778-4814/+7272
| | | | | |
| * | | | | Update slugThomas Müller2015-08-251-1/+1
| |/ / / /
* | | | | Merge pull request #18554 from owncloud/fix-gs-share-masterMorris Jobke2015-08-252-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Simply hide sharing buttons for IE8
| * | | | | don't load gs-shareThomas Müller2015-08-251-2/+4
| | | | | |
| * | | | | Simply hide sharing buttons for IE8 - fixes #18011Thomas Müller2015-08-252-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #18558 from owncloud/ext-objectstoreLukas Reschke2015-08-252-2/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Prevent objectstore being set from client side
| * | | | Prevent objectstore being set from client sideRobin McCorkell2015-08-252-2/+16
| | | | |
* | | | | Merge pull request #18506 from owncloud/round-avatarsJan-Christoph Borchardt2015-08-251-0/+12
|\ \ \ \ \ | | | | | | | | | | | | make profile photos round
| * | | | | make profile photos roundJan-Christoph Borchardt2015-08-251-0/+12
| | |_|/ / | |/| | |
* | | | | Merge pull request #18550 from owncloud/mobile-shared-styleJan-Christoph Borchardt2015-08-252-7/+9
|\ \ \ \ \ | |/ / / / |/| | | | fix being able to distinguish shared items on mobile
| * | | | fix being able to distinguish shared items on mobileJan-Christoph Borchardt2015-08-252-7/+9
| |/ / /
* | | | Merge pull request #18543 from owncloud/remove-linesJan-Christoph Borchardt2015-08-253-4/+8
|\ \ \ \ | | | | | | | | | | Remove some lines
| * | | | reduce files table header lineJan-Christoph Borchardt2015-08-251-2/+6
| | | | |
| * | | | replace apps navigation line with whitespaceJan-Christoph Borchardt2015-08-251-1/+1
| | | | |
| * | | | replace section line with whitespaceJan-Christoph Borchardt2015-08-251-1/+1
| |/ / /
* | | | Merge pull request #18552 from owncloud/triangle-iconsJan-Christoph Borchardt2015-08-2510-81/+8
|\ \ \ \ | | | | | | | | | | adjust style of triangle and caret icons
| * | | | adjust style of triangle and caret iconsJan-Christoph Borchardt2015-08-2510-81/+8
| |/ / /
* | | | Merge pull request #18545 from owncloud/button-styleMorris Jobke2015-08-251-1/+1
|\ \ \ \ | |_|/ / |/| | | remove border from button style
| * | | remove border from button styleJan-Christoph Borchardt2015-08-251-1/+1
| |/ /
* | | Merge pull request #18538 from owncloud/sidebar-improvementsVincent Petry2015-08-258-10/+62
|\ \ \ | |/ / |/| | Fix sidebar for trashbin and others
| * | Fix row highlight in other file listsVincent Petry2015-08-251-0/+1
| | |
| * | Fix trashbin sidebarVincent Petry2015-08-254-4/+47
| | | | | | | | | | | | | | | Do not display size as it is not available. Use display name instead of name to remove the ".d123456" suffix.
| * | Properly hide sidebar when switching between files app sectionsVincent Petry2015-08-253-6/+14
| | | | | | | | | | | | | | | Since there are multiple sidebars, one for each files app section, we need to hide the correct ones.
* | | Merge pull request #18440 from owncloud/ext-backends.customjsMorris Jobke2015-08-2516-308/+529
|\ \ \ | |/ / |/| | Migrate custom JS external storage backends to new registration API [part 2]
| * | Migrate Google external storage to new APIRobin McCorkell2015-08-258-147/+201
| | |
| * | Migrate Dropbox external storage to new APIRobin McCorkell2015-08-258-130/+189
| | |
| * | Migrate AmazonS3 external storage to new APIRobin McCorkell2015-08-254-27/+109
| | |