summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* change controls bar color to white for less grey-in-grey designJan-Christoph Borchardt2014-07-021-2/+2
|
* 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
| | | |
* | | | Merge pull request #9334 from owncloud/defaultappfixVincent Petry2014-07-014-7/+101
|\ \ \ \ | |_|_|/ |/| | | Default app fix
| * | | Added unit test for default app URLVincent Petry2014-07-012-1/+69
| | | |
| * | | Use getAbsoluteUrl for redirection URLVincent Petry2014-07-011-5/+17
| | | | | | | | | | | | | | | | | | | | Also separate the function into getDefaultPageUrl() and redirectToDefaultPage() to make it testable.
| * | | Support for multiple default appsVincent Petry2014-07-012-4/+16
| | | | | | | | | | | | | | | | | | | | If a default app isn't visible for the user, try the next one. Else fallback to the "files" app.
| * | | 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 message
| * | | 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 in User Management
| * | | hides table header while users load.raghunayyar2014-07-011-0/+2
| | | |
* | | | Merge pull request #9328 from owncloud/extstorage-annoyingwarningsVincent Petry2014-07-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix warnings when personal is not set
| * | | | Fix warnings when personal is not setVincent Petry2014-07-011-1/+1
| | |/ / | |/| |
* | | | Merge pull request #9156 from owncloud/solve-8959blizzz2014-07-018-15/+115
|\ \ \ \ | | | | | | | | | | search term for users and groups may occur anywhere in the name or displ...
| * | | | loop over usernames, not passwordsArthur Schiwon2014-06-301-1/+1
| | | | |
| * | | | extend Dummy user and group implementation to pass testsArthur Schiwon2014-06-253-6/+46
| | | | |
| * | | | clean up created groups after testing, and correct parameter orderArthur Schiwon2014-06-242-11/+10
| | | | |
| * | | | return int, not stringArthur Schiwon2014-06-241-1/+5
| | | | |
| * | | | add testsArthur Schiwon2014-06-233-1/+58
| | | | |
| * | | | search term for users and groups may occur anywhere in the name or ↵Arthur Schiwon2014-06-232-5/+5
| | | | | | | | | | | | | | | | | | | | displayname, not just in the beginning
* | | | | Merge pull request #9006 from owncloud/ldap_fix_bgjobblizzz2014-07-012-3/+8
|\ \ \ \ \ | | | | | | | | | | | | LDAP: fix background job, fixes #8995
| * | | | | also adapt result check from readAttributeArthur Schiwon2014-06-271-2/+1
| | | | | |
| * | | | | fix instantiation of Access classArthur Schiwon2014-06-271-1/+7
| | | | | |
| * | | | | specify no attribute for group exists check, as done with usersArthur Schiwon2014-06-271-1/+1
| | | | | |
* | | | | | Merge pull request #9326 from owncloud/add_missing_backticksVincent Petry2014-07-011-7/+21
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | add missing backticks
| * | | | | add missing backticksJörn Friedrich Dreyer2014-07-011-7/+21
| | | | | |
* | | | | | Merge pull request #9287 from owncloud/indie-jsonFrank Karlitschek2014-07-011-0/+92
|\ \ \ \ \ \ | |/ / / / / |/| | | | | add indie.json for Indie App Store listing
| * | | | | add indie.json for Indie App Store listingJan-Christoph Borchardt2014-06-291-0/+92
| | | | | |
* | | | | | Merge pull request #9306 from owncloud/publicneedsupgradeJan-Christoph Borchardt2014-07-013-1/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return 503 in public.php and OCS API when upgrade is due
| * | | | | | Return 503 OCS response with requested formatVincent Petry2014-06-302-2/+3
| | | | | | |
| * | | | | | Return 503 in public.php and OCS API when upgrade is dueVincent Petry2014-06-302-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent unexpected behavior, public.php and the OCS API calls will return 503 Service Unavailable when an upgrade is due.
* | | | | | | Merge pull request #9313 from owncloud/design-icon-cancelMorris Jobke2014-07-011-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | change 'Cancel upload' text to x icon for more space in breadcrumbs bar