Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #20905 from owncloud/allow-framing-itself | Thomas Müller | 2015-12-02 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Allow framing 'self' | Lukas Reschke | 2015-12-02 | 2 | -1/+10 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff | Thomas Müller | 2015-12-02 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Replace old config code with usage of proper APIs | Morris Jobke | 2015-12-02 | 1 | -3/+4 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-users | Thomas Müller | 2015-12-02 | 17 | -42/+779 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix endless recursion | Thomas Müller | 2015-12-02 | 1 | -3/+15 | |
| * | | | | | | | Fix update of avatar image | Thomas Müller | 2015-12-02 | 2 | -33/+49 | |
| * | | | | | | | Fix comments | Thomas Müller | 2015-12-02 | 2 | -4/+4 | |
| * | | | | | | | Proposal: add enumeration function to IUserManager which simply calls a callb... | Thomas Müller | 2015-12-02 | 1 | -20/+17 | |
| * | | | | | | | Specify the email type and set name properly | Thomas Müller | 2015-12-02 | 2 | -14/+66 | |
| * | | | | | | | Add converter to generate/update a vcard from a given user | Thomas Müller | 2015-12-02 | 3 | -23/+218 | |
| * | | | | | | | Add system principal to cal of each card | Thomas Müller | 2015-12-02 | 2 | -0/+49 | |
| * | | | | | | | Add the user's cloud id to the vCard | Thomas Müller | 2015-12-02 | 3 | -19/+7 | |
| * | | | | | | | Add user's email address to vCard | Thomas Müller | 2015-12-02 | 1 | -2/+7 | |
| * | | | | | | | Update addressbook home configuration for CalDAVTester | Thomas Müller | 2015-12-02 | 2 | -6/+6 | |
| * | | | | | | | user and system addressbooks are now living in sub folders | Thomas Müller | 2015-12-02 | 7 | -15/+78 | |
| * | | | | | | | Adding a second principal backend which holds system principals - as of now o... | Thomas Müller | 2015-12-02 | 3 | -15/+191 | |
| * | | | | | | | Add IUser::getAvatarImage() for easy access | Thomas Müller | 2015-12-02 | 1 | -4/+9 | |
| * | | | | | | | Adding system addressbook for users of this instance - a occ command is suppl... | Thomas Müller | 2015-12-02 | 6 | -2/+181 | |
* | | | | | | | | Merge pull request #20875 from owncloud/remove-changepropagator | Thomas Müller | 2015-12-02 | 4 | -524/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove old propagation logic | Robin Appelman | 2015-12-01 | 4 | -524/+0 | |
* | | | | | | | | | Merge pull request #20884 from owncloud/fix_20713 | Thomas Müller | 2015-12-02 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [Sharing] Respect disabled incoming federated shares | Roeland Jago Douma | 2015-12-02 | 1 | -1/+3 | |
| |/ / / / / / / | ||||||
* / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-02 | 8 | -4/+28 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20710 from owncloud/files_external_config_command | Thomas Müller | 2015-12-01 | 4 | -0/+220 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | return non 0 status code in case of missing mount | Robin Appelman | 2015-12-01 | 1 | -1/+1 | |
| * | | | | | | | Add command to set mount options for external storages | Robin Appelman | 2015-12-01 | 4 | -10/+114 | |
| * | | | | | | | Add command to get and set config for external mounts | Robin Appelman | 2015-12-01 | 2 | -0/+116 | |
* | | | | | | | | Revert "Fix column width of mtime column" | Morris Jobke | 2015-12-01 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20825 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-01 | 6 | -9/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Adjust patches | Thomas Müller | 2015-11-30 | 3 | -6/+6 | |
| * | | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-11-30 | 5 | -6/+6 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-01 | 2 | -0/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20842 from owncloud/fix-date-time-column | Thomas Müller | 2015-11-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix column width of mtime column | Morris Jobke | 2015-11-30 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favorites | Thomas Müller | 2015-11-30 | 3 | -18/+50 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Inject the database connection | Joas Schilling | 2015-11-30 | 3 | -2/+16 | |
| * | | | | | | | | Only require the interface | Joas Schilling | 2015-11-30 | 2 | -10/+10 | |
| * | | | | | | | | Add a unit test that executes the query | Joas Schilling | 2015-11-30 | 1 | -0/+15 | |
| * | | | | | | | | Correctly escape the paths so we only display favorites instead of wildcards | Joas Schilling | 2015-11-30 | 1 | -1/+1 | |
| * | | | | | | | | Oracle can not return statements but only values | Joas Schilling | 2015-11-30 | 2 | -7/+10 | |
* | | | | | | | | | Merge pull request #20843 from owncloud/fix-share-with-input | Thomas Müller | 2015-11-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix the width of the share with input | Morris Jobke | 2015-11-30 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #20837 from owncloud/fix-mountoptions-dropdown | Thomas Müller | 2015-11-30 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix ext storage mount options dropdown | Vincent Petry | 2015-11-30 | 1 | -1/+0 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdav | Thomas Müller | 2015-11-30 | 2 | -7/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix public link getDownloadUrl to return Webdav public link | Vincent Petry | 2015-11-25 | 2 | -7/+10 | |
* | | | | | | | | More group DB | Thomas Müller | 2015-11-30 | 1 | -0/+7 | |
* | | | | | | | | Add DB group to some files_external tests | Thomas Müller | 2015-11-30 | 16 | -1/+113 | |
* | | | | | | | | Adding more DB groups to test suits | Thomas Müller | 2015-11-30 | 11 | -4/+70 |