summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | 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 API
| * | | | | | | Use filtered list for ext storage list mounts APIVincent Petry2014-06-302-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the external storage correctly returns the mount points visible only for the current user by using the method getAbsoluteMountPoints() which is already filtered. Since that call was missing the backend name which is important for the UI, this one was added as well.
* | | | | | | | Merge pull request #9292 from owncloud/issue/9161Morris Jobke2014-07-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use get random bytes as uniqeid() is not unique in some cases
| * | | | | | | | Use get random bytes as uniqeid() is not unique in some casesJoas Schilling2014-06-301-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fix #9161
* | | | | | | | Merge pull request #9307 from Gomez/masterSteffen Lindner2014-07-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes typo with sendmail detection - fixes #9203
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | [encryption] check if file still exists before removing encryption keys
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete operation
* | | | | | | | | Merge pull request #9305 from owncloud/design-share-fixesJan-Christoph Borchardt2014-06-303-4/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Design share fixes
| * | | | | | | | 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
| | | | | | | | |
| * | | | | | | | remove obsolete CSS, fix visual bug in share dialog #9255Jan-Christoph Borchardt2014-06-301-2/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #9303 from owncloud/issue/8841Jörn Friedrich Dreyer2014-06-301-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Do not strict compare item source id so the dropdown is closed correctly
| * | | | | | | Use attr() instead of data() so the item ids work as intendedJoas Schilling2014-06-301-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fix #8841
* | | | | | | Merge pull request #9301 from owncloud/dont_check_external_stoage_appBjörn Schießle2014-06-302-7/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [server2server-sharing] no longer check if the external storage app is enabled
| * | | | | | no longer check if the external storage app is enabled, we use no the webdav ↵Bjoern Schiessle2014-06-302-7/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | implementation from core
* | | | | | Merge pull request #9207 from owncloud/prevent-default-for-mail-testJoas Schilling2014-06-302-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix test mail behaviour
| * | | | | Fix test mail behaviourMorris Jobke2014-06-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ref #8854 * prevent default of "send test mail" button * drop unused form serialization * use display name of user for test mail
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-30115-956/+1498
| | | | | |
* | | | | | Merge pull request #9266 from owncloud/fix_objectstore_etag_updateThomas Müller2014-06-291-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | always regenerate etag when writing back file to objectstore
| * | | | | always regenerate etag when writing back file to objectstoreJörn Friedrich Dreyer2014-06-271-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-29465-11164/+33397
| | | | | |