summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | do not disclose information, show generic error on login pageJörn Friedrich Dreyer2015-04-102-0/+10
| * | | | | | | do not hide exception when ldap server has a hiccupJörn Friedrich Dreyer2015-04-103-17/+10
* | | | | | | | Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedsh...Morris Jobke2015-04-101-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Clear leftover shares from other testsVincent Petry2015-04-101-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #15510 from owncloud/cron-singleuserThomas Müller2015-04-105-16/+36
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix singe user mode on public.php - take twoThomas Müller2015-04-102-2/+6
| * | | | | | Fix single user check in case no user is logged inThomas Müller2015-04-091-13/+19
| * | | | | | block ocs in single user modeRobin Appelman2015-04-091-1/+3
| * | | | | | block webdav in single user modeRobin Appelman2015-04-091-0/+3
| * | | | | | block cron when in single user modeRobin Appelman2015-04-091-0/+5
* | | | | | | Merge pull request #15530 from owncloud/davclient-catchmoreexceptionsMorris Jobke2015-04-102-68/+72
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix converting Guzzle error codes in s2s storageVincent Petry2015-04-101-10/+13
| * | | | | | Catch more exceptions when connecting to remote DAV serverVincent Petry2015-04-102-58/+59
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #15528 from owncloud/share-loadingThomas Müller2015-04-101-1/+5
|\ \ \ \ \ \
| * | | | | | fix share input loading spinner, fix #15522Jan-Christoph Borchardt2015-04-101-1/+5
|/ / / / / /
* | | | | | Merge pull request #15398 from Volker-E/masterJan-Christoph Borchardt2015-04-101-23/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixing #15397Volker E2015-04-041-13/+13
| * | | | | fixing #15396 accessibility of table#userlistVolker E2015-04-041-12/+12
* | | | | | Merge pull request #15521 from owncloud/shareinfo-catchguzzle503Morris Jobke2015-04-101-0/+5
|\ \ \ \ \ \
| * | | | | | Properly catch guzzle 503 when querying share infoVincent Petry2015-04-091-0/+5
* | | | | | | Merge pull request #15437 from owncloud/deleteorphanedfilesThomas Müller2015-04-103-0/+180
|\ \ \ \ \ \ \
| * | | | | | | [command] delete orphaned file cache entriesMorris Jobke2015-04-083-0/+180
* | | | | | | | Merge pull request #15404 from Crote/occ-password-from-envThomas Müller2015-04-102-22/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Add password input from env variable for occ user:{add, resetpassword}Laurens Post2015-04-042-22/+54
* | | | | | | | | Merge pull request #15182 from rullzer/fix-8231Thomas Müller2015-04-101-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure we do not return people that we already shared withRoeland Jago Douma2015-03-251-0/+17
* | | | | | | | | | Merge pull request #15492 from owncloud/ldap-wizard-overhaulblizzz2015-04-0961-1630/+5143
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | change default value of ldap_tls to 0. It will be detected anyway, but starti...Arthur Schiwon2015-04-092-1/+4
| * | | | | | | | | | compile user and login filter on the first time automatically, if a suggestio...Arthur Schiwon2015-04-094-0/+10
| * | | | | | | | | | escape filter for outputArthur Schiwon2015-04-091-1/+1
| * | | | | | | | | | fix number and insert position when adding/copying a configArthur Schiwon2015-04-091-2/+2
| * | | | | | | | | | update back/continue buttons also on tab clickArthur Schiwon2015-04-093-3/+8
| * | | | | | | | | | cleanupArthur Schiwon2015-04-091-2/+0
| * | | | | | | | | | newlines at end of fileArthur Schiwon2015-04-0912-14/+11
| * | | | | | | | | | docArthur Schiwon2015-04-091-2/+2
| * | | | | | | | | | move script and style inclusions into templateArthur Schiwon2015-04-092-46/+53
| * | | | | | | | | | run functionality checks also when host field changesArthur Schiwon2015-04-091-1/+1
| * | | | | | | | | | adjust testsArthur Schiwon2015-04-091-6/+9
| * | | | | | | | | | LDAP Wizard OverhaulArthur Schiwon2015-04-0961-1620/+5110
* | | | | | | | | | | Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_sharesThomas Müller2015-04-092-2/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | only create a db entry for the user in case of a name conflict on group shareBjoern Schiessle2015-04-092-2/+14
* | | | | | | | | | | | Merge pull request #15512 from owncloud/autoclose-settings-menuVincent Petry2015-04-091-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't stop event execution for menu item clickMorris Jobke2015-04-091-2/+4
* | | | | | | | | | | | | Merge pull request #15511 from owncloud/fix-typosLukas Reschke2015-04-098-13/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix mock object to return proper typeThomas Müller2015-04-091-0/+2
| * | | | | | | | | | | | Fix mock object to return proper typeThomas Müller2015-04-091-0/+2
| * | | | | | | | | | | | Fix typos and some other adjustmentsLukas Reschke2015-04-096-13/+21
* | | | | | | | | | | | | Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSourceMorris Jobke2015-04-091-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fixes #15326Jörn Friedrich Dreyer2015-04-091-1/+3
* | | | | | | | | | | | | | Merge pull request #15282 from owncloud/keepsharerelationshipondeleteVincent Petry2015-04-093-36/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \