Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove deprecated shipped flag from info.xml which has no use anymore | Joas Schilling | 2016-01-07 | 9 | -9/+0 |
* | Add ownCloud min and max version for shipped apps | Joas Schilling | 2016-01-07 | 10 | -12/+14 |
* | Add a warning to the app:check-code if the version is missing | Joas Schilling | 2016-01-07 | 2 | -0/+9 |
* | Add a warning on the apps list when the version is missing | Joas Schilling | 2016-01-07 | 2 | -0/+15 |
* | Merge pull request #21404 from owncloud/symfony_console_2.8.0 | Thomas Müller | 2016-01-07 | 1 | -0/+0 |
|\ | |||||
| * | [3rdparty] Bump symfony/console to 2.8.0 | Roeland Jago Douma | 2016-01-01 | 1 | -0/+0 |
* | | Merge pull request #21343 from owncloud/ldap-showremnants-json-output | Thomas Müller | 2016-01-07 | 1 | -11/+15 |
|\ \ | |||||
| * | | Add an option to occ ldap:showremnants to output a json encoded array for use... | Stephen Colebrook | 2015-12-22 | 1 | -11/+15 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-07 | 184 | -2034/+1786 |
* | | | Merge pull request #20994 from owncloud/personal-page | Thomas Müller | 2016-01-06 | 5 | -102/+149 |
|\ \ \ | |||||
| * | | | fix overlap and functionality of cropper | Jan-Christoph Borchardt | 2015-12-28 | 3 | -3/+19 |
| * | | | improve layout of personal settings page | Jan-Christoph Borchardt | 2015-12-28 | 5 | -103/+134 |
* | | | | Merge pull request #21349 from owncloud/web_use_sharee | Thomas Müller | 2016-01-06 | 2 | -19/+406 |
|\ \ \ \ | |||||
| * | | | | Added js tests for the Sharee API usage | Roeland Jago Douma | 2015-12-30 | 1 | -0/+292 |
| * | | | | Fix unit tests | Roeland Jago Douma | 2015-12-30 | 2 | -7/+33 |
| * | | | | Filter out share owner in sharee suggestion list | Roeland Jago Douma | 2015-12-30 | 1 | -0/+9 |
| * | | | | Web sharing uses sharee endpoint | Roeland Jago Douma | 2015-12-30 | 1 | -15/+75 |
* | | | | | Merge pull request #21398 from owncloud/sharing-disabled-cache | Thomas Müller | 2016-01-06 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Cache sharing disabled in the view | Robin Appelman | 2015-12-30 | 1 | -2/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21443 from owncloud/fix-container-lookup | Thomas Müller | 2016-01-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Lookup the App name instead of OCA | Joas Schilling | 2016-01-04 | 1 | -1/+1 |
* | | | | | | Merge pull request #21444 from owncloud/move-regenerate-below | Thomas Müller | 2016-01-06 | 8 | -8/+72 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Assign DB group for unit tests | Lukas Reschke | 2016-01-04 | 1 | -0/+4 |
| * | | | | | | Move regeneration of session ID into session classes | Lukas Reschke | 2016-01-04 | 8 | -8/+68 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21459 from owncloud/make-ldap-more-robust | Thomas Müller | 2016-01-06 | 2 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make LDAP more robust to exceptions and log them properly | Morris Jobke | 2016-01-06 | 2 | -1/+2 |
* | | | | | | | Merge pull request #21469 from owncloud/drop-old-gallery-table | Thomas Müller | 2016-01-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Drop oc_gallery_sharing which was removed in 8.0.0 | Morris Jobke | 2016-01-06 | 1 | -0/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #21482 from owncloud/htaccess-ico-rule | Thomas Müller | 2016-01-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow ico files to be served statically | Morris Jobke | 2016-01-06 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #21488 from th3fallen/patch-1 | Thomas Müller | 2016-01-06 | 1 | -4/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Blacklist myself | Clark Tomlinson | 2016-01-06 | 1 | -4/+12 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #21473 from owncloud/fix-unit-tests-because-appstore | Jörn Friedrich Dreyer | 2016-01-06 | 5 | -32/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Inject OCSClient | Lukas Reschke | 2016-01-06 | 5 | -32/+38 |
|/ / / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-06 | 20 | -30/+56 |
* | | | | | | Merge pull request #21409 from JohannesKleine/patch-1 | Jörn Friedrich Dreyer | 2016-01-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into patch-1 | JohannesKleine | 2016-01-02 | 4 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update config.sample.php | JohannesKleine | 2015-12-31 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #21377 from owncloud/login-submit-button-border-2 | Jörn Friedrich Dreyer | 2016-01-05 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unnecessary border from login button | Christoph Wurst | 2015-12-29 | 1 | -0/+2 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21446 from edwardcrompton/feature/21413-better-occ-user-help | Jörn Friedrich Dreyer | 2016-01-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Whitespace correction | Edward Crompton | 2016-01-04 | 1 | -1/+1 |
| * | | | | | | | | Removing the . from the end of the help response to match convention set by o... | Edward Crompton | 2016-01-04 | 1 | -1/+1 |
| * | | | | | | | | Adding a more helpful error message for when occ is run at the console as the... | Edward Crompton | 2016-01-04 | 1 | -1/+2 |
* | | | | | | | | | Merge pull request #21454 from owncloud/proper-style-sidebar-transparency | Jörn Friedrich Dreyer | 2016-01-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use color instead of transparency for proper tooltip appearance | Morris Jobke | 2016-01-05 | 1 | -0/+3 |
* | | | | | | | | | | Merge pull request #21442 from owncloud/annotate-type | Jörn Friedrich Dreyer | 2016-01-05 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Annotate type | Lukas Reschke | 2016-01-04 | 1 | -6/+8 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-05 | 72 | -116/+216 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #21393 from owncloud/fix-urlgenerator-call | Thomas Müller | 2016-01-04 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |