summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove shadow effects from settings icons, reduce sizeJan-Christoph Borchardt2014-07-0210-35/+11
* Merge pull request #9311 from owncloud/storage-not-availableVincent Petry2014-07-0212-70/+232
|\
| * 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
|\ \
| * | 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 warningVincent Petry2014-07-021-1/+1
* | | | Merge pull request #9245 from owncloud/server2server-sharing-design-fixesMorris Jobke2014-07-023-16/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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.phpGeorg Ehrke2014-06-291-1/+1
* | | | Merge pull request #9341 from owncloud/sharing-fileactions-fixMorris Jobke2014-07-026-55/+115
|\ \ \ \
| * | | | Use fileActionsReady to re-render sharing iconsVincent Petry2014-07-016-56/+106
| * | | | 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
|\ \ \ \ \
| * | | | | Fix indentSteffen Lindner2014-07-021-2/+2
| * | | | | initialize a dummy memory session - fixes https://github.com/owncloud/activit...Steffen Lindner2014-07-021-0/+3
* | | | | | Merge pull request #9344 from owncloud/files-scrollissueMorris Jobke2014-07-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fix files list scroll behaviorVincent Petry2014-07-011-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #9336 from owncloud/fix-version-dropdownMorris Jobke2014-07-021-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | fix redirect URL unit testMorris Jobke2014-07-021-1/+3
| * | | | | | Redirect after session expiry to the previous loaded pageMorris Jobke2014-07-011-0/+2
| |/ / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-02229-6263/+5869
* | | | | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtestVincent Petry2014-07-013-13/+33
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge pull request #9334 from owncloud/defaultappfixVincent Petry2014-07-014-7/+101
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Added unit test for default app URLVincent Petry2014-07-012-1/+69
| * | | | | | Use getAbsoluteUrl for redirection URLVincent Petry2014-07-011-5/+17
| * | | | | | Support for multiple default appsVincent Petry2014-07-012-4/+16
| * | | | | | Add bak defaultapp settingVincent Petry2014-07-011-1/+3
* | | | | | | Merge pull request #9335 from owncloud/fix-expire-message-layoutMorris Jobke2014-07-011-1/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix the layout of the enforced expiry date messageMorris Jobke2014-07-011-1/+8
|/ / / / / /
* | | | | | Merge pull request #9330 from owncloud/jumpingheadericewind19912014-07-011-0/+2
|\ \ \ \ \ \
| * | | | | | hides table header while users load.raghunayyar2014-07-011-0/+2