summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove trashbin storage wrapper when disabling it for testsVincent Petry2015-04-091-0/+3
| * | | | | | | | | Remove unused $toRemoveVincent Petry2015-04-091-3/+0
| * | | | | | | | | Keep shares when deleting shared foldersVincent Petry2015-04-092-33/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #14540 from owncloud/windows-setup-checkLukas Reschke2015-04-091-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disallow Windows Server in Server CheckLukas Reschke2015-04-091-0/+13
* | | | | | | | | | Merge pull request #15501 from owncloud/better-output-format-consoleMorris Jobke2015-04-094-18/+110
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | change handling in app:listJoas Schilling2015-04-092-23/+26
| * | | | | | | | | Replace print_r() with pretty jsonJoas Schilling2015-04-091-9/+6
| * | | | | | | | | Add an option to get the output in plain, json or print_r syntaxJoas Schilling2015-04-094-15/+107
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #15235 from owncloud/remote-share-hintMorris Jobke2015-04-093-6/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly generate the doc link via go.phpJoas Schilling2015-04-092-4/+5
| * | | | | | | | | Fix config usageJoas Schilling2015-04-091-6/+5
| * | | | | | | | | fix remote share info icon for IE8Jan-Christoph Borchardt2015-04-091-1/+1
| * | | | | | | | | add more present info about remote shares, fix layout of inputsJan-Christoph Borchardt2015-04-092-2/+17
| * | | | | | | | | correct remote share hintJan-Christoph Borchardt2015-03-261-1/+1
| * | | | | | | | | add remote share status to the configBjoern Schiessle2015-03-261-0/+4
| * | | | | | | | | add hint in Share placeholder on remote share syntaxJan-Christoph Borchardt2015-03-261-1/+6
* | | | | | | | | | Merge pull request #13896 from owncloud/share-generatetarget-remove-excludeBjörn Schießle2015-04-091-17/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Dont create exclude list for generating the share targetRobin Appelman2015-02-041-17/+2
* | | | | | | | | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deletingThomas Müller2015-04-093-12/+29
|\ \ \ \ \ \ \ \ \ \