Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix the layout of the enforced expiry date message | Morris Jobke | 2014-07-01 | 1 | -1/+8 |
| | |||||
* | Merge pull request #9330 from owncloud/jumpingheader | icewind1991 | 2014-07-01 | 1 | -0/+2 |
|\ | | | | | Hides table header while users load in User Management | ||||
| * | hides table header while users load. | raghunayyar | 2014-07-01 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #9328 from owncloud/extstorage-annoyingwarnings | Vincent Petry | 2014-07-01 | 1 | -1/+1 |
|\ \ | | | | | | | Fix warnings when personal is not set | ||||
| * | | Fix warnings when personal is not set | Vincent Petry | 2014-07-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9156 from owncloud/solve-8959 | blizzz | 2014-07-01 | 8 | -15/+115 |
|\ \ \ | | | | | | | | | search term for users and groups may occur anywhere in the name or displ... | ||||
| * | | | loop over usernames, not passwords | Arthur Schiwon | 2014-06-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | extend Dummy user and group implementation to pass tests | Arthur Schiwon | 2014-06-25 | 3 | -6/+46 |
| | | | | |||||
| * | | | clean up created groups after testing, and correct parameter order | Arthur Schiwon | 2014-06-24 | 2 | -11/+10 |
| | | | | |||||
| * | | | return int, not string | Arthur Schiwon | 2014-06-24 | 1 | -1/+5 |
| | | | | |||||
| * | | | add tests | Arthur Schiwon | 2014-06-23 | 3 | -1/+58 |
| | | | | |||||
| * | | | search term for users and groups may occur anywhere in the name or ↵ | Arthur Schiwon | 2014-06-23 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | displayname, not just in the beginning | ||||
* | | | | Merge pull request #9006 from owncloud/ldap_fix_bgjob | blizzz | 2014-07-01 | 2 | -3/+8 |
|\ \ \ \ | | | | | | | | | | | LDAP: fix background job, fixes #8995 | ||||
| * | | | | also adapt result check from readAttribute | Arthur Schiwon | 2014-06-27 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | fix instantiation of Access class | Arthur Schiwon | 2014-06-27 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | specify no attribute for group exists check, as done with users | Arthur Schiwon | 2014-06-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #9326 from owncloud/add_missing_backticks | Vincent Petry | 2014-07-01 | 1 | -7/+21 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | add missing backticks | ||||
| * | | | | add missing backticks | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -7/+21 |
| | | | | | |||||
* | | | | | Merge pull request #9287 from owncloud/indie-json | Frank Karlitschek | 2014-07-01 | 1 | -0/+92 |
|\ \ \ \ \ | |/ / / / |/| | | | | add indie.json for Indie App Store listing | ||||
| * | | | | add indie.json for Indie App Store listing | Jan-Christoph Borchardt | 2014-06-29 | 1 | -0/+92 |
| | | | | | |||||
* | | | | | Merge pull request #9306 from owncloud/publicneedsupgrade | Jan-Christoph Borchardt | 2014-07-01 | 3 | -1/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Return 503 in public.php and OCS API when upgrade is due | ||||
| * | | | | | Return 503 OCS response with requested format | Vincent Petry | 2014-06-30 | 2 | -2/+3 |
| | | | | | | |||||
| * | | | | | Return 503 in public.php and OCS API when upgrade is due | Vincent Petry | 2014-06-30 | 2 | -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-cancel | Morris Jobke | 2014-07-01 | 1 | -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 bar | Jan-Christoph Borchardt | 2014-06-30 | 1 | -3/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #9300 from owncloud/extstorage-listfilterfix | Vincent Petry | 2014-07-01 | 2 | -16/+20 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use filtered list for ext storage list mounts API | ||||
| * | | | | | | | Use filtered list for ext storage list mounts API | Vincent Petry | 2014-06-30 | 2 | -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/9161 | Morris Jobke | 2014-07-01 | 1 | -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 cases | Joas Schilling | 2014-06-30 | 1 | -2/+2 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9161 | ||||
* | | | | | | | | Merge pull request #9307 from Gomez/master | Steffen Lindner | 2014-07-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixes typo with sendmail detection - fixes #9203 | ||||
| * | | | | | | | | Fixes typo with sendmail detection - fixes #9203 | Steffen Lindner | 2014-06-30 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-01 | 46 | -278/+427 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #9240 from owncloud/enc_check_if_file_exists | Björn Schießle | 2014-06-30 | 2 | -38/+237 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | [encryption] check if file still exists before removing encryption keys | ||||
| * | | | | | | | | improved error message | Bjoern Schiessle | 2014-06-30 | 1 | -7/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | unit tests | Bjoern Schiessle | 2014-06-27 | 1 | -19/+192 |
| | | | | | | | | | |||||
| * | | | | | | | | check if file exists before deleting keys, and add debug output for every | Bjoern Schiessle | 2014-06-27 | 1 | -15/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete operation | ||||
* | | | | | | | | | Merge pull request #9305 from owncloud/design-share-fixes | Jan-Christoph Borchardt | 2014-06-30 | 3 | -4/+7 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Design share fixes | ||||
| * | | | | | | | | make expiration message grey, less present in dropdown | Jan-Christoph Borchardt | 2014-06-30 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fix expire message going out of box, fix #9280 | Jan-Christoph Borchardt | 2014-06-30 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | remove obsolete CSS, fix visual bug in share dialog #9255 | Jan-Christoph Borchardt | 2014-06-30 | 1 | -2/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #9303 from owncloud/issue/8841 | Jörn Friedrich Dreyer | 2014-06-30 | 1 | -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 intended | Joas Schilling | 2014-06-30 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Fix #8841 | ||||
* | | | | | | | Merge pull request #9301 from owncloud/dont_check_external_stoage_app | Björn Schießle | 2014-06-30 | 2 | -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 Schiessle | 2014-06-30 | 2 | -7/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | implementation from core | ||||
* | | | | | | Merge pull request #9207 from owncloud/prevent-default-for-mail-test | Joas Schilling | 2014-06-30 | 2 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix test mail behaviour | ||||
| * | | | | | Fix test mail behaviour | Morris Jobke | 2014-06-25 | 2 | -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 transifex | Jenkins for ownCloud | 2014-06-30 | 115 | -956/+1498 |
| | | | | | | |||||
* | | | | | | Merge pull request #9266 from owncloud/fix_objectstore_etag_update | Thomas Müller | 2014-06-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | always regenerate etag when writing back file to objectstore | ||||
| * | | | | | always regenerate etag when writing back file to objectstore | Jörn Friedrich Dreyer | 2014-06-27 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-29 | 465 | -11164/+33397 |
| | | | | | |