summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #9329 from owncloud/sharing_check_targetVincent Petry2014-07-027-19/+42
|\ \ \ \ \ | | | | | | | | | | | | don't move a share mount point into a different mount point
| * | | | | don't move a share mount point into a different mount pointBjoern Schiessle2014-07-014-17/+36
| | | | | |
| * | | | | add a explicit interface for the home storageBjoern Schiessle2014-07-013-2/+6
| | | | | |
* | | | | | Merge pull request #9373 from owncloud/design-fix-modifiedVincent Petry2014-07-021-2/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | shade color for modified dates again, fix #9363
| * | | | | simplify formula and add commentMorris Jobke2014-07-021-2/+3
| | | | | |
| * | | | | shade color for modified dates again, fix #9363Jan-Christoph Borchardt2014-07-021-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #9369 from owncloud/designfix-updateJan-Christoph Borchardt2014-07-021-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Update dialog running out of horizontal space in Firefox. fixes #9298
| * | | | | Fix update dialog running out of horizontal space in Firefox. Fixes #9298jbtbnl2014-07-021-0/+5
| | | | | |
* | | | | | Merge pull request #9364 from owncloud/sharing_rename_mount_pointsVincent Petry2014-07-022-0/+59
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [sharing] rename mount point of children if parent was renamed
| * | | | | rename mount point of children if parent was renamedBjoern Schiessle2014-07-022-0/+59
| | |/ / / | |/| | |
* | | | | Merge pull request #9311 from owncloud/storage-not-availableVincent Petry2014-07-0212-70/+232
|\ \ \ \ \ | |_|_|_|/ |/| | | | Handle storages not being available in webui and webdav
| * | | | Remove invalid mounts from the active fsRobin Appelman2014-07-022-0/+5
| | | | |
| * | | | Fix unit testRobin Appelman2014-07-021-0/+1
| | | | |
| * | | | Fixed remote share password param detectionVincent Petry2014-07-011-1/+1
| | | | |
| * | | | Catch StorageInvalidException in webdavRobin Appelman2014-07-011-0/+3
| | | | |
| * | | | More error catching in list.phpRobin Appelman2014-07-011-7/+22
| | | | |
| * | | | Remove external shares if the share is invalidRobin Appelman2014-07-012-1/+10
| | | | |
| * | | | Detect removed public sharesRobin Appelman2014-07-014-18/+102
| | | | |
| * | | | Handle StorageNotAvailableException in webdavRobin Appelman2014-06-301-1/+6
| | | | |
| * | | | If loading a directory fails, navigate back to the previous directoryRobin Appelman2014-06-301-11/+12
| | | | |
| * | | | Handle StorageNotAvailableException in ajax/list.phpRobin Appelman2014-06-301-27/+37
| | | | |
| * | | | Add StorageNotAvailableExceptionRobin Appelman2014-06-302-17/+46
| | | | |
* | | | | Merge pull request #9370 from owncloud/design-fix-usermgmt-glitchMorris Jobke2014-07-021-0/+14
|\ \ \ \ \ | | | | | | | | | | | | Design fix usermgmt glitch
| * | | | | allow horizontal scrollbar in settings to make user mgmt usable on mobileJan-Christoph Borchardt2014-07-021-0/+5
| | | | | |
| * | | | | prevent overflow in user management controls bar, fix #9277Jan-Christoph Borchardt2014-07-021-0/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #9362 from owncloud/public-servicewarningfixThomas Müller2014-07-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix service warning
| * | | | | Fix service warningVincent Petry2014-07-021-1/+1
| | | | | |
* | | | | | Merge pull request #9245 from owncloud/server2server-sharing-design-fixesMorris Jobke2014-07-023-16/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | drop unneeded code
| * | | | | drop unneeded codeMorris Jobke2014-06-273-16/+1
| | | | | |
* | | | | | Merge pull request #9288 from owncloud/fix_dispatcher_null_valuesMorris Jobke2014-07-021-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | don't typecast null values inside dispatcher.php
| * | | | | don't typecast null values inside dispatcher.phpGeorg Ehrke2014-06-291-1/+1
| | | | | |
* | | | | | Merge pull request #9341 from owncloud/sharing-fileactions-fixMorris Jobke2014-07-026-55/+115
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix fileActionsReady event after deferred file actions update
| * | | | | Use fileActionsReady to re-render sharing iconsVincent Petry2014-07-016-56/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever file actions are modified, either by registering new actions or when appending a new page of entries, the sharing app is now notified so it can correctly refresh the sharing icon status. Additionally, the core's loadIcons() method is also used to load the existing shares and also refresh the sharing icons afterwards.
| * | | | | Fix fileActionsReady event after deferred file actions updateVincent Petry2014-07-012-1/+11
| | | | | |
* | | | | | Merge pull request #9350 from Gomez/masterSteffen Lindner2014-07-021-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | initialize a dummy memory session - fixes https://github.com/owncloud/ac...
| * | | | | | Fix indentSteffen Lindner2014-07-021-2/+2
| | | | | | |
| * | | | | | initialize a dummy memory session - fixes ↵Steffen Lindner2014-07-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/activity/issues/78
* | | | | | | Merge pull request #9344 from owncloud/files-scrollissueMorris Jobke2014-07-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix files list scroll behavior
| * | | | | | | Fix files list scroll behaviorVincent Petry2014-07-011-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | View container height needs to be accurate and span over the whole scroll container for infinite scrolling to work properly.
* | | | | | | Merge pull request #9336 from owncloud/fix-version-dropdownMorris Jobke2014-07-021-1/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | increase width of version dropdown - fixes #9270
| * | | | | | add ellipsizing to restore string if text is too longJan-Christoph Borchardt2014-07-011-0/+3
| | | | | | |
| * | | | | | increase width of version dropdown - fixes #9270Morris Jobke2014-07-011-1/+1
| | | | | | |
* | | | | | | Merge pull request #9338 from owncloud/fix-redirect-for-appframeworkVolkan Gezer2014-07-022-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Redirect after session expiry to the previous loaded page
| * | | | | | | fix redirect URL unit testMorris Jobke2014-07-021-1/+3
| | | | | | | |
| * | | | | | | Redirect after session expiry to the previous loaded pageMorris Jobke2014-07-011-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * fixes #6945
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-02229-6263/+5869
| | | | | | |
* | | | | | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtestVincent Petry2014-07-013-13/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added migrator test for reserved keyword
| * | | | | | | Update submodule to include the PostgresPlatform patchVincent Petry2014-07-011-0/+0
| | | | | | | |
| * | | | | | | Added test for reserved keywordsVincent Petry2014-07-011-0/+22
| | | | | | | |
| * | | | | | | Fix migrator tests to use the correct migrator instancesVincent Petry2014-07-012-13/+11
| | | | | | | |