Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #12142 from owncloud/DeprecateOldIAPICalls | Morris Jobke | 2014-11-24 | 3 | -0/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Deprecate older API wrappers and calls | Lukas Reschke | 2014-11-12 | 3 | -0/+7 | |
* | | | | | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_info | Morris Jobke | 2014-11-24 | 2 | -8/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | also check for the correct owner if it was submitted | Bjoern Schiessle | 2014-11-21 | 2 | -8/+14 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-24 | 4 | -2/+6 | |
* | | | | | | remove ugly hack and don't use OC\Preview\Image for tiffs and svgs | Georg Ehrke | 2014-11-23 | 2 | -11/+1 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-22 | 4 | -0/+6 | |
|/ / / / | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-21 | 8 | -0/+138 | |
* | | | | Revert "drop OC_Preferences::getUsers and getApps" | Morris Jobke | 2014-11-20 | 2 | -0/+54 | |
* | | | | drop OC_Preferences::getUsers and getApps | Morris Jobke | 2014-11-20 | 2 | -54/+0 | |
* | | | | Merge pull request #12330 from owncloud/jenkins-eat-that | Morris Jobke | 2014-11-20 | 3 | -15/+10 | |
|\ \ \ \ | ||||||
| * | | | | drop dependency of some commands on old config object | Morris Jobke | 2014-11-20 | 3 | -15/+10 | |
* | | | | | Merge pull request #12321 from owncloud/checkForXMLWriter | Thomas Müller | 2014-11-20 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Check for XMLWriter class | Lukas Reschke | 2014-11-20 | 1 | -0/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #12299 from owncloud/clean-lib-base-config | Morris Jobke | 2014-11-20 | 1 | -23/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | replace double quotes with single quotes | Morris Jobke | 2014-11-19 | 1 | -1/+1 | |
| * | | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig | Morris Jobke | 2014-11-19 | 1 | -23/+29 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #12325 from owncloud/removeunneccessarylang | Lukas Reschke | 2014-11-20 | 11 | -164/+0 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 11 | -164/+0 | |
* | | | | | Merge pull request #12226 from owncloud/remove-phpass | Thomas Müller | 2014-11-20 | 2 | -5/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove phpass and migrate to new Hasher interface | Lukas Reschke | 2014-11-17 | 2 | -5/+2 | |
* | | | | | | Merge pull request #12297 from owncloud/issue/10991-all-testcase | Morris Jobke | 2014-11-20 | 1 | -3/+0 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Use base class to reset the file mapper | Joas Schilling | 2014-11-19 | 1 | -3/+0 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #12253 from owncloud/port-12154 | Vincent Petry | 2014-11-20 | 4 | -11/+47 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add repair steps for legacy config files | Lukas Reschke | 2014-11-18 | 2 | -1/+31 | |
| * | | | | | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 2 | -10/+16 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-20 | 4 | -2/+6 | |
| |/ / / / |/| | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-19 | 4 | -2/+6 | |
* | | | | | drop unneeded var_dump - fixes #9997 | Morris Jobke | 2014-11-18 | 1 | -1/+0 | |
* | | | | | Merge pull request #12261 from oparoz/patch-1 | Morris Jobke | 2014-11-18 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replace deprecated switches | Olivier Paroz | 2014-11-18 | 1 | -1/+1 | |
* | | | | | | Merge pull request #12224 from owncloud/fix_12211 | Björn Schießle | 2014-11-18 | 1 | -9/+22 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | only users can have a display name different from the id | Bjoern Schiessle | 2014-11-18 | 1 | -1/+4 | |
| * | | | | | make sure that we only find the shares from the correct share type if users a... | Bjoern Schiessle | 2014-11-18 | 1 | -2/+8 | |
| * | | | | | make sure that we don't find the wrong shares if a user and a group have the ... | Bjoern Schiessle | 2014-11-18 | 1 | -6/+10 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager | Lukas Reschke | 2014-11-18 | 1 | -4/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix type hinting for app manager | Robin Appelman | 2014-11-18 | 1 | -4/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #12242 from owncloud/fix-undefined-size | Lukas Reschke | 2014-11-18 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Check if the size field is available | Lukas Reschke | 2014-11-17 | 1 | -1/+1 | |
* | | | | | Merge pull request #12237 from owncloud/fix-12236 | Morris Jobke | 2014-11-18 | 1 | -5/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make declaration compatible | Lukas Reschke | 2014-11-17 | 1 | -5/+5 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #9962 from owncloud/app-group-enable-remote | Lukas Reschke | 2014-11-18 | 1 | -0/+75 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Add sabredav plugin to check if a user has access to an app | Robin Appelman | 2014-11-17 | 1 | -0/+75 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-18 | 4 | -0/+8 | |
* | | | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse | Lukas Reschke | 2014-11-17 | 1 | -0/+3 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Move CSRF check | Lukas Reschke | 2014-11-17 | 1 | -0/+3 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #11741 from owncloud/delete_all_children_preview_2 | Vincent Petry | 2014-11-17 | 1 | -16/+94 | |
|\ \ \ \ | ||||||
| * | | | | delete all children's previews when deleting a folder | Georg Ehrke | 2014-10-30 | 1 | -16/+94 | |
* | | | | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 2 | -2/+12 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Make it possible to cleanPath() absolute Windows paths | Joas Schilling | 2014-11-17 | 1 | -2/+11 |