summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* | | | Merge pull request #9328 from owncloud/extstorage-annoyingwarningsVincent Petry2014-07-011-1/+1
|\ \ \ \
| * | | | Fix warnings when personal is not setVincent Petry2014-07-011-1/+1
| | |/ / | |/| |
* | | | Merge pull request #9156 from owncloud/solve-8959blizzz2014-07-018-15/+115
|\ \ \ \
| * | | | 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 displaynam...Arthur Schiwon2014-06-232-5/+5
* | | | | Merge pull request #9006 from owncloud/ldap_fix_bgjobblizzz2014-07-012-3/+8
|\ \ \ \ \
| * | | | | 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 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 listingJan-Christoph Borchardt2014-06-291-0/+92
* | | | | | Merge pull request #9306 from owncloud/publicneedsupgradeJan-Christoph Borchardt2014-07-013-1/+18
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | 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 barJan-Christoph Borchardt2014-06-301-3/+2
* | | | | | | | Merge pull request #9300 from owncloud/extstorage-listfilterfixVincent Petry2014-07-012-16/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Use filtered list for ext storage list mounts APIVincent Petry2014-06-302-16/+20
* | | | | | | | Merge pull request #9292 from owncloud/issue/9161Morris Jobke2014-07-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use get random bytes as uniqeid() is not unique in some casesJoas Schilling2014-06-301-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #9307 from Gomez/masterSteffen Lindner2014-07-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes typo with sendmail detection - fixes #9203Steffen Lindner2014-06-301-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0146-278/+427
* | | | | | | | | Merge pull request #9240 from owncloud/enc_check_if_file_existsBjörn Schießle2014-06-302-38/+237
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | improved error messageBjoern Schiessle2014-06-301-7/+8
| * | | | | | | | unit testsBjoern Schiessle2014-06-271-19/+192
| * | | | | | | | check if file exists before deleting keys, and add debug output for everyBjoern Schiessle2014-06-271-15/+40
* | | | | | | | | Merge pull request #9305 from owncloud/design-share-fixesJan-Christoph Borchardt2014-06-303-4/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | make expiration message grey, less present in dropdownJan-Christoph Borchardt2014-06-301-1/+1
| * | | | | | | | fix expire message going out of box, fix #9280Jan-Christoph Borchardt2014-06-301-1/+2