Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adding occ command to create an addressbook | Thomas Müller | 2015-11-06 | 2 | -0/+60 |
* | Introducing CardDAV into core | Thomas Müller | 2015-11-06 | 22 | -23/+958 |
* | Merge pull request #20365 from owncloud/autoloader-fix | Thomas Müller | 2015-11-06 | 3 | -22/+69 |
|\ | |||||
| * | [autoloader] Make sure to load construct full paths | Roeland Jago Douma | 2015-11-06 | 3 | -22/+69 |
* | | Merge pull request #18039 from owncloud/favicon-up-to-ie10 | Thomas Müller | 2015-11-06 | 5 | -3/+3 |
|\ \ | |||||
| * | | update example theme favicon | Morris Jobke | 2015-11-03 | 1 | -0/+0 |
| * | | Add favicon for IE 8+ | Morris Jobke | 2015-11-03 | 4 | -3/+3 |
* | | | Merge pull request #20350 from owncloud/add-log-statement-for-cron | Thomas Müller | 2015-11-06 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Add debug log statement for IJobList steps in cron.php | Morris Jobke | 2015-11-06 | 1 | -0/+2 |
* | | | | Merge pull request #20346 from owncloud/show-language-code-for-unknown-languages | Thomas Müller | 2015-11-06 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | Show the language code in personal settings for unknown languages | Morris Jobke | 2015-11-06 | 1 | -0/+8 |
* | | | | | Merge pull request #20358 from owncloud/extstorage-properlythrowexception | Thomas Müller | 2015-11-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Properly throw exception in OC_Mount_Config::getBackendStatus | Vincent Petry | 2015-11-06 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20359 from owncloud/mark-files-drop-as-shipped | Thomas Müller | 2015-11-06 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Mark files_drop as shipped | Lukas Reschke | 2015-11-06 | 1 | -0/+1 |
* | | | | | Merge pull request #20340 from owncloud/fix-ocs-error-code | Thomas Müller | 2015-11-06 | 2 | -2/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Revert OCS error code change from #20135 | Joas Schilling | 2015-11-05 | 2 | -2/+17 |
* | | | | | Merge pull request #20348 from owncloud/issue-20303-integer-group-names | Thomas Müller | 2015-11-06 | 2 | -1/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Make sure that group names are strings not integers | Joas Schilling | 2015-11-06 | 2 | -1/+29 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20288 from owncloud/fix_20234 | Thomas Müller | 2015-11-06 | 2 | -1/+109 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | make sure that we update the unencrypted size for the versions | Björn Schießle | 2015-11-04 | 2 | -1/+109 |
* | | | | | Merge pull request #20271 from owncloud/fix-18701 | Thomas Müller | 2015-11-06 | 2 | -20/+149 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | integration tests | Arthur Schiwon | 2015-11-04 | 1 | -0/+118 |
| * | | | | LDAP: attempt to connect to backup server again, if main server is not availa... | Arthur Schiwon | 2015-11-03 | 1 | -20/+31 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-06 | 8 | -0/+56 |
* | | | | | Merge pull request #19872 from owncloud/share2.0_sharemanager | Thomas Müller | 2015-11-05 | 13 | -5/+2232 |
|\ \ \ \ \ | |||||
| * | | | | | Fix oracle | Roeland Jago Douma | 2015-11-05 | 1 | -35/+119 |
| * | | | | | Add unshare hooks | Roeland Jago Douma | 2015-11-05 | 4 | -103/+187 |
| * | | | | | Use the old code for remote shares for now | Roeland Jago Douma | 2015-11-05 | 1 | -0/+8 |
| * | | | | | The new sharing code now handles deletion | Roeland Jago Douma | 2015-11-05 | 12 | -106/+1469 |
| * | | | | | Prepare OCS Share endpoint | Roeland Jago Douma | 2015-11-05 | 2 | -5/+70 |
| * | | | | | Initial setup of shareing 2.0 sharemanager and share | Roeland Jago Douma | 2015-11-05 | 3 | -0/+623 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20339 from owncloud/header-not-bold | Lukas Reschke | 2015-11-05 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | do not bold header of update screen | Jan-Christoph Borchardt | 2015-11-05 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #20273 from owncloud/sharing-api-adding-tests | Thomas Müller | 2015-11-05 | 2 | -0/+203 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into sharing-api-adding-tests | Sergio Bertolín | 2015-11-05 | 94 | -294/+686 |
| |\ \ \ \ | |||||
| * | | | | | Added changes in the verification of sharing get responses | Sergio Bertolin | 2015-11-05 | 2 | -2/+37 |
| * | | | | | added test for deleting a share | Sergio Bertolin | 2015-11-04 | 2 | -1/+19 |
| * | | | | | Added general function to create shares in preconditions. | Sergio Bertolin | 2015-11-04 | 2 | -7/+97 |
| * | | | | | enhancements to pre and post conditions | Sergio Bertolin | 2015-11-03 | 1 | -0/+60 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #20325 from owncloud/subadmin-handle-null | Thomas Müller | 2015-11-05 | 2 | -6/+47 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | subadmin methods should not return any null user or group | Arthur Schiwon | 2015-11-05 | 2 | -6/+47 |
* | | | | | Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting | Thomas Müller | 2015-11-05 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | [files_external] fix empty user mounts setting | Morris Jobke | 2015-11-04 | 1 | -0/+5 |
* | | | | | Merge pull request #20320 from owncloud/drop-file_map | Thomas Müller | 2015-11-05 | 2 | -61/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Drop unused table file_map | Morris Jobke | 2015-11-05 | 3 | -62/+2 |
* | | | | | | Merge pull request #20321 from owncloud/drop-principal-tables | Thomas Müller | 2015-11-05 | 2 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Drop unused tables principalgroups and principals | Morris Jobke | 2015-11-05 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-05 | 32 | -28/+178 |
* | | | | | Merge pull request #20315 from owncloud/add-coverity | Thomas Müller | 2015-11-04 | 1 | -0/+1 |
|\ \ \ \ \ |