Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15437 from owncloud/deleteorphanedfiles | Thomas Müller | 2015-04-10 | 3 | -0/+180 |
|\ | |||||
| * | [command] delete orphaned file cache entries | Morris Jobke | 2015-04-08 | 3 | -0/+180 |
* | | Merge pull request #15404 from Crote/occ-password-from-env | Thomas Müller | 2015-04-10 | 2 | -22/+54 |
|\ \ | |||||
| * | | Add password input from env variable for occ user:{add, resetpassword} | Laurens Post | 2015-04-04 | 2 | -22/+54 |
* | | | Merge pull request #15182 from rullzer/fix-8231 | Thomas Müller | 2015-04-10 | 1 | -0/+17 |
|\ \ \ | |||||
| * | | | Make sure we do not return people that we already shared with | Roeland Jago Douma | 2015-03-25 | 1 | -0/+17 |
* | | | | Merge pull request #15492 from owncloud/ldap-wizard-overhaul | blizzz | 2015-04-09 | 61 | -1630/+5143 |
|\ \ \ \ | |||||
| * | | | | change default value of ldap_tls to 0. It will be detected anyway, but starti... | Arthur Schiwon | 2015-04-09 | 2 | -1/+4 |
| * | | | | compile user and login filter on the first time automatically, if a suggestio... | Arthur Schiwon | 2015-04-09 | 4 | -0/+10 |
| * | | | | escape filter for output | Arthur Schiwon | 2015-04-09 | 1 | -1/+1 |
| * | | | | fix number and insert position when adding/copying a config | Arthur Schiwon | 2015-04-09 | 1 | -2/+2 |
| * | | | | update back/continue buttons also on tab click | Arthur Schiwon | 2015-04-09 | 3 | -3/+8 |
| * | | | | cleanup | Arthur Schiwon | 2015-04-09 | 1 | -2/+0 |
| * | | | | newlines at end of file | Arthur Schiwon | 2015-04-09 | 12 | -14/+11 |
| * | | | | doc | Arthur Schiwon | 2015-04-09 | 1 | -2/+2 |
| * | | | | move script and style inclusions into template | Arthur Schiwon | 2015-04-09 | 2 | -46/+53 |
| * | | | | run functionality checks also when host field changes | Arthur Schiwon | 2015-04-09 | 1 | -1/+1 |
| * | | | | adjust tests | Arthur Schiwon | 2015-04-09 | 1 | -6/+9 |
| * | | | | LDAP Wizard Overhaul | Arthur Schiwon | 2015-04-09 | 61 | -1620/+5110 |
* | | | | | Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares | Thomas Müller | 2015-04-09 | 2 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | only create a db entry for the user in case of a name conflict on group share | Bjoern Schiessle | 2015-04-09 | 2 | -2/+14 |
* | | | | | | Merge pull request #15512 from owncloud/autoclose-settings-menu | Vincent Petry | 2015-04-09 | 1 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't stop event execution for menu item click | Morris Jobke | 2015-04-09 | 1 | -2/+4 |
* | | | | | | | Merge pull request #15511 from owncloud/fix-typos | Lukas Reschke | 2015-04-09 | 8 | -13/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix mock object to return proper type | Thomas Müller | 2015-04-09 | 1 | -0/+2 |
| * | | | | | | | Fix mock object to return proper type | Thomas Müller | 2015-04-09 | 1 | -0/+2 |
| * | | | | | | | Fix typos and some other adjustments | Lukas Reschke | 2015-04-09 | 6 | -13/+21 |
* | | | | | | | | Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource | Morris Jobke | 2015-04-09 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixes #15326 | Jörn Friedrich Dreyer | 2015-04-09 | 1 | -1/+3 |
* | | | | | | | | | Merge pull request #15282 from owncloud/keepsharerelationshipondelete | Vincent Petry | 2015-04-09 | 3 | -36/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove trashbin storage wrapper when disabling it for tests | Vincent Petry | 2015-04-09 | 1 | -0/+3 |
| * | | | | | | | | | Remove unused $toRemove | Vincent Petry | 2015-04-09 | 1 | -3/+0 |
| * | | | | | | | | | Keep shares when deleting shared folders | Vincent Petry | 2015-04-09 | 2 | -33/+0 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #14540 from owncloud/windows-setup-check | Lukas Reschke | 2015-04-09 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Disallow Windows Server in Server Check | Lukas Reschke | 2015-04-09 | 1 | -0/+13 |
* | | | | | | | | | | Merge pull request #15501 from owncloud/better-output-format-console | Morris Jobke | 2015-04-09 | 4 | -18/+110 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | change handling in app:list | Joas Schilling | 2015-04-09 | 2 | -23/+26 |
| * | | | | | | | | | Replace print_r() with pretty json | Joas Schilling | 2015-04-09 | 1 | -9/+6 |
| * | | | | | | | | | Add an option to get the output in plain, json or print_r syntax | Joas Schilling | 2015-04-09 | 4 | -15/+107 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #15235 from owncloud/remote-share-hint | Morris Jobke | 2015-04-09 | 3 | -6/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Correctly generate the doc link via go.php | Joas Schilling | 2015-04-09 | 2 | -4/+5 |
| * | | | | | | | | | Fix config usage | Joas Schilling | 2015-04-09 | 1 | -6/+5 |
| * | | | | | | | | | fix remote share info icon for IE8 | Jan-Christoph Borchardt | 2015-04-09 | 1 | -1/+1 |
| * | | | | | | | | | add more present info about remote shares, fix layout of inputs | Jan-Christoph Borchardt | 2015-04-09 | 2 | -2/+17 |
| * | | | | | | | | | correct remote share hint | Jan-Christoph Borchardt | 2015-03-26 | 1 | -1/+1 |
| * | | | | | | | | | add remote share status to the config | Bjoern Schiessle | 2015-03-26 | 1 | -0/+4 |
| * | | | | | | | | | add hint in Share placeholder on remote share syntax | Jan-Christoph Borchardt | 2015-03-26 | 1 | -1/+6 |
* | | | | | | | | | | Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude | Björn Schießle | 2015-04-09 | 1 | -17/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Dont create exclude list for generating the share target | Robin Appelman | 2015-02-04 | 1 | -17/+2 |
* | | | | | | | | | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting | Thomas Müller | 2015-04-09 | 3 | -12/+29 |
|\ \ \ \ \ \ \ \ \ \ |