Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21797 from owncloud/proper-controller-in-core | Thomas Müller | 2016-01-21 | 12 | -52/+21 |
|\ | |||||
| * | move lost controller to core/controller | Morris Jobke | 2016-01-20 | 7 | -42/+11 |
| * | move user controller to core/controller | Morris Jobke | 2016-01-20 | 2 | -2/+2 |
| * | move setup controller to core/controller | Morris Jobke | 2016-01-20 | 2 | -3/+3 |
| * | move avatar controller to core/controller | Morris Jobke | 2016-01-20 | 3 | -5/+5 |
* | | Merge pull request #21808 from owncloud/testing-app-details | Thomas Müller | 2016-01-21 | 2 | -2/+6 |
|\ \ | |||||
| * | | testing app: fix app name capitalization | Jan-Christoph Borchardt | 2016-01-21 | 1 | -1/+1 |
| * | | testing app: add max version | Jan-Christoph Borchardt | 2016-01-21 | 1 | -1/+1 |
| * | | testing app: add logo | Jan-Christoph Borchardt | 2016-01-21 | 1 | -0/+4 |
* | | | Merge pull request #21778 from owncloud/share-calendars | Thomas Müller | 2016-01-21 | 22 | -204/+339 |
|\ \ \ | |||||
| * | | | Add back the current-user-principal test suite | Thomas Müller | 2016-01-19 | 1 | -1/+1 |
| * | | | CalDAV sync tests | Thomas Müller | 2016-01-19 | 21 | -203/+331 |
| * | | | Adjust CalDAV tests | Thomas Müller | 2016-01-19 | 2 | -2/+9 |
* | | | | Merge pull request #21792 from owncloud/systemtags-managerfactory | Thomas Müller | 2016-01-21 | 9 | -7/+192 |
|\ \ \ \ | |||||
| * | | | | Allow custom implementation of system tag managers | Vincent Petry | 2016-01-20 | 9 | -7/+192 |
* | | | | | Merge pull request #20847 from owncloud/systemtags-ui | Thomas Müller | 2016-01-21 | 23 | -8/+1553 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Adjust system tags app max version | Vincent Petry | 2016-01-20 | 1 | -1/+1 |
| * | | | | Fix app metadata/test issues for system tags app | Vincent Petry | 2016-01-20 | 2 | -2/+2 |
| * | | | | Fix content type parsing in system tags plugin | Vincent Petry | 2016-01-20 | 1 | -1/+1 |
| * | | | | Added system tags GUI in sidebar | Vincent Petry | 2016-01-19 | 22 | -26/+1512 |
| * | | | | Implement toggleselect extension for select2 | Vincent Petry | 2016-01-19 | 1 | -0/+59 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-21 | 134 | -222/+154 |
* | | | | | Merge pull request #21782 from owncloud/update-system-addressbook-on-user-cha... | Thomas Müller | 2016-01-21 | 22 | -138/+207 |
|\ \ \ \ \ | |||||
| * | | | | | Use IUser::setEMailAddress in ldap as well | Thomas Müller | 2016-01-20 | 11 | -103/+132 |
| * | | | | | Emit OC\User::changeUser on change of display name | Thomas Müller | 2016-01-20 | 1 | -1/+6 |
| * | | | | | React on OC_User::changeUser hook and update the user's vcard | Thomas Müller | 2016-01-20 | 1 | -0/+9 |
| * | | | | | Introduce IUser::setEMailAddress and add hook mechanism | Thomas Müller | 2016-01-20 | 11 | -37/+63 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21775 from owncloud/apcu-iterator-constructor | Thomas Müller | 2016-01-20 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix constructor arguments for APCUIterator | Robin Appelman | 2016-01-18 | 1 | -1/+1 |
* | | | | | | Merge pull request #21805 from owncloud/app-dependency-spacing | Frank Karlitschek | 2016-01-20 | 1 | -1/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | remove unneeded margin of app dependencies in app mgmt | Jan-Christoph Borchardt | 2016-01-20 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displayname | Thomas Müller | 2016-01-20 | 5 | -1/+141 |
|\ \ \ \ \ | |||||
| * | | | | | LDAP: do not attempt to process user records without display name, fixes fata... | Arthur Schiwon | 2016-01-11 | 5 | -1/+141 |
* | | | | | | Merge pull request #21793 from owncloud/di_shareproviderfactory | Thomas Müller | 2016-01-20 | 4 | -6/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly DI the servercontainer | Roeland Jago Douma | 2016-01-20 | 4 | -6/+28 |
* | | | | | | | Merge pull request #21795 from owncloud/remove-unneeded-markup | Thomas Müller | 2016-01-20 | 2 | -10/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Remove unneeded markup for scan process - ref #20545 | Morris Jobke | 2016-01-20 | 2 | -10/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-20 | 26 | -30/+390 |
* | | | | | | Merge pull request #21785 from owncloud/cron-sync-system-addressbook | Thomas Müller | 2016-01-20 | 6 | -5/+102 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Install cron job on install and update | Thomas Müller | 2016-01-19 | 3 | -4/+52 |
| * | | | | | Add daily cron job to sync system address book | Thomas Müller | 2016-01-18 | 4 | -2/+51 |
* | | | | | | Merge pull request #21724 from owncloud/fix-occ-app-management-for-group-apps | Thomas Müller | 2016-01-19 | 4 | -14/+70 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Make it possible to enable apps for groups only via occ | Joas Schilling | 2016-01-19 | 2 | -6/+37 |
| * | | | | | Make it possible to disable apps via the console, which are not enabled for t... | Joas Schilling | 2016-01-19 | 2 | -3/+16 |
| * | | | | | Make sure to list "group enabled" apps as enabled | Joas Schilling | 2016-01-19 | 2 | -5/+17 |
|/ / / / / | |||||
* | | | | | Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2 | Thomas Müller | 2016-01-19 | 32 | -113/+587 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix test for ensureSystemAddressBookExists | Thomas Müller | 2016-01-18 | 2 | -5/+4 |
| * | | | | Fix join condition for oracle | Thomas Müller | 2016-01-18 | 1 | -1/+1 |
| * | | | | Adjust ctor call | Thomas Müller | 2016-01-18 | 1 | -1/+2 |
| * | | | | Fix xml namespace in test | Thomas Müller | 2016-01-18 | 1 | -1/+1 |