Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update 3rdparty with sabre/dav 3.0.9 | Joas Schilling | 2016-04-07 | 1 | -0/+0 |
| | |||||
* | Merge pull request #23806 from ↵ | Thomas Müller | 2016-04-07 | 3 | -12/+27 |
|\ | | | | | | | | | owncloud/multiline-javascript-strings-for-translations Also use Javascript as language in l10n.pl - fixes #13924 | ||||
| * | Move some translation stings around to enable xgettext to detect them | Thomas Müller | 2016-04-07 | 2 | -11/+9 |
| | | |||||
| * | Also use Javascript as language in l10n.pl - fixes #13924 | Thomas Müller | 2016-04-07 | 1 | -1/+18 |
| | | |||||
* | | Merge pull request #23444 from owncloud/add-loading-spinner | Jan-Christoph Borchardt | 2016-04-07 | 1 | -0/+19 |
|\ \ | | | | | | | Add loading spinner to "Add to owncloud" | ||||
| * | | add loading spinner to add to owncloud input field | Erik Pellikka | 2016-04-07 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | Update public.js Update public.js | ||||
* | | | Merge pull request #23773 from owncloud/share_move_delete_user_hook | Joas Schilling | 2016-04-07 | 10 | -20/+317 |
|\ \ \ | |_|/ |/| | | Migrate post_userDelete hook to share manager | ||||
| * | | Migrate post_userDelete hook to share manager | Roeland Jago Douma | 2016-04-04 | 10 | -20/+317 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the post_userDelete hook call the sharemanager. This will cleanup to and from this user. * All shares owned by this user * All shares with this user (user) * All custom group shares * All link share initiated by this user (to avoid invisible link shares) Unit tests are added for the defaultshare provider as well as the federated share provider | ||||
* | | | Merge pull request #23833 from owncloud/remove-xxx | Thomas Müller | 2016-04-07 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove xxx from ownCloud we dont want to see that 🙈 | ||||
| * | | | Remove xxx from ownCloud we dont want to see that 🙈 | Joas Schilling | 2016-04-07 | 1 | -1/+0 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-07 | 218 | -2206/+2702 |
| | | | |||||
* | | | Merge pull request #23768 from owncloud/skjnldsv-color-generator-edit | John Molakvoæ | 2016-04-07 | 1 | -5/+23 |
|\ \ \ | | | | | | | | | Updated color generator | ||||
| * | | | Updated color generator | John Molakvoæ | 2016-04-06 | 1 | -5/+23 |
|/ / / | | | | | | | | | | Separated the main function to allow special use without dom manipulation. | ||||
* | | | Merge pull request #23766 from owncloud/replace-getid-3 | Lukas Reschke | 2016-04-06 | 2 | -6/+10 |
|\ \ \ | | | | | | | | | Replace getid3 with ID3Parser | ||||
| * | | | Replace getid3 with ID3Parser | Lukas Reschke | 2016-04-06 | 2 | -6/+10 |
| | | | | |||||
* | | | | Merge pull request #23822 from stweil/master | Thomas Müller | 2016-04-06 | 8 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | tests: Fix typos (found by codespell) | ||||
| * | | | | tests: Fix typos (found by codespell) | Stefan Weil | 2016-04-06 | 8 | -11/+11 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Fix also a small grammar issue. Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | | | Merge pull request #23501 from owncloud/alarms_for_birthdayevents | Thomas Müller | 2016-04-06 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | add VALARM for birthday events | ||||
| * \ \ \ | Merge branch 'master' into alarms_for_birthdayevents | Achim Königs | 2016-03-26 | 416 | -1162/+1320 |
| |\ \ \ \ | |||||
| * | | | | | add VALARM for birthday events | Achim Königs | 2016-03-23 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | ACTION=DISPLAY *should* prevents audible alarms. | ||||
* | | | | | | Merge pull request #23823 from owncloud/drop-js-based-acceptance-tests | Thomas Müller | 2016-04-06 | 30 | -2344/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Drop JS based acceptance tests - we have our behat based integration … | ||||
| * | | | | | | Drop JS based acceptance tests - we have our behat based integration tests ↵ | Thomas Müller | 2016-04-06 | 30 | -2344/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | which are activly maintained | ||||
* | | | | | | | Merge pull request #23819 from owncloud/move-core-completely-to-psr4 | Roeland Douma | 2016-04-06 | 60 | -4/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move OC/Core completely to PSR-4 | ||||
| * | | | | | | | Remove OC/Core autoloading from old autoloader | Lukas Reschke | 2016-04-06 | 2 | -4/+2 |
| | | | | | | | | |||||
| * | | | | | | | Rename files to be PSR-4 compliant | Lukas Reschke | 2016-04-06 | 58 | -0/+0 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #23820 from owncloud/move-settings-completely-to-psr4 | Roeland Douma | 2016-04-06 | 13 | -4/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move OC/Settings completely to PSR-4 | ||||
| * | | | | | | | Remove OC/Settings from old autoloader | Lukas Reschke | 2016-04-06 | 2 | -4/+2 |
| | | | | | | | | |||||
| * | | | | | | | Rename files to be PSR-4 compliant | Lukas Reschke | 2016-04-06 | 11 | -0/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #23777 from owncloud/ldap-null-user | Lukas Reschke | 2016-04-06 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Handle case where the user is not known | ||||
| * | | | | | | | Handle case where the user is not known - fixes #23759 | Thomas Müller | 2016-04-04 | 1 | -5/+7 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-06 | 6 | -0/+12 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #23818 from owncloud/use-proper-methods | Joas Schilling | 2016-04-06 | 7 | -11/+11 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Use proper shortcut methods in templates | ||||
| * | | | | | | Use proper shortcut methods in templates | Morris Jobke | 2016-04-06 | 7 | -11/+11 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #23763 from owncloud/do_not_export_share_type_2 | Morris Jobke | 2016-04-06 | 1 | -2/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Share type 2 is private | ||||
| * | | | | | | Share type 2 is private | Roeland Jago Douma | 2016-04-04 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added to the factory for legacy reasons when converting from old to new sharing code. It is not used anymore so can be deleted. Which means we no longer expose internal types. | ||||
* | | | | | | | Merge pull request #23793 from owncloud/hard-code-dav-endpoints | Thomas Müller | 2016-04-06 | 2 | -12/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | All webdav endpoints within remote.php are now hardcoded - helps to p… | ||||
| * | | | | | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent ↵ | Thomas Müller | 2016-04-05 | 2 | -12/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know | ||||
* | | | | | | | | Merge pull request #23808 from owncloud/test-lock-with-strange-filename | Roeland Douma | 2016-04-06 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Test locking with strange filename | ||||
| * | | | | | | | | Test locking with strange filename | Jörn Friedrich Dreyer | 2016-04-05 | 1 | -0/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-06 | 178 | -526/+84 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer | Thomas Müller | 2016-04-05 | 5 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add OC\Core and OC\Settings to composer autoloader | ||||
| * | | | | | | | | | Move OC\Core and OC\Settings to composer autoloader | Lukas Reschke | 2016-04-05 | 5 | -1/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #23794 from owncloud/handle-null-in-usermanager | Thomas Müller | 2016-04-05 | 2 | -10/+14 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Prevent null to be passed into the closure of callForAllUsers | ||||
| * | | | | | | | | Prevent null to be passed into the closure of callForAllUsers | Thomas Müller | 2016-04-05 | 2 | -10/+14 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #23040 from owncloud/mobile-css-loading | Thomas Müller | 2016-04-05 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | load mobile styles last, fix #19596 | ||||
| * | | | | | | | load mobile styles last, fix #19596 | Jan-Christoph Borchardt | 2016-04-05 | 1 | -6/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #23791 from owncloud/fix-swift-test-mkfifo | Thomas Müller | 2016-04-05 | 2 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Remove any stray socket files before creating new ones | ||||
| * | | | | | | Remove any stray socket files before creating new ones | Robin McCorkell | 2016-04-05 | 2 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #23677 from owncloud/db-schema-migration-feedback | Thomas Müller | 2016-04-05 | 8 | -39/+198 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Show individual sql schema migration steps during upgrade - on web as… | ||||
| * | | | | | | Fix verbose output of upgrade command - not progressbar in this case and the ↵ | Thomas Müller | 2016-04-04 | 3 | -19/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | schema migration test has one progressbar now for all tables - before we had one progressbar for each table |