summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-09352-2416/+2472
|
* Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooksThomas Müller2016-04-085-33/+148
|\ | | | | Propagate birthdays of shared addressbooks to the sharee's birthday c…
| * Propagate birthday to group shares as wellThomas Müller2016-03-234-31/+121
| |
| * Propagate birthdays of shared addressbooks to the sharee's birthday calendar ↵Thomas Müller2016-03-233-19/+44
| | | | | | | | as well
* | Merge pull request #23839 from owncloud/sabre-dav-3.0.9Thomas Müller2016-04-081-0/+0
|\ \ | | | | | | Update 3rdparty with 3.0.9 sabre/dav
| * | Update 3rdparty with sabre/dav 3.0.9Joas Schilling2016-04-071-0/+0
| | |
* | | Merge pull request #23553 from owncloud/lock-ttl-execution-timeThomas Müller2016-04-086-10/+26
|\ \ \ | | | | | | | | Make lock ttl configurable
| * | | Make lock ttl configurableRobin Appelman2016-04-076-10/+26
| | | |
* | | | Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_managerThomas Müller2016-04-085-51/+252
|\ \ \ \ | | | | | | | | | | Move public webdav auth to share manager
| * | | | Add unit tests for public auth webdavRoeland Jago Douma2016-04-081-0/+170
| | | | |
| * | | | Move public webdav auth over to share managerRoeland Jago Douma2016-04-082-50/+44
| | | | | | | | | | | | | | | | | | | | The public webdav auth should use the shiny new share manager.
| * | | | Set proper permissions on link shareRoeland Jago Douma2016-04-082-1/+38
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | If we do not allow public upload we should limit the permissions on links shares upon retrieval. * Added unit test * Allow fetching federated shares by token as well
* | | | Merge pull request #23848 from stweil/masterThomas Müller2016-04-0829-36/+36
|\ \ \ \ | |/ / / |/| | | lib: Fix typos (found by codespell)
| * | | lib: Fix typos (found by codespell)Stefan Weil2016-04-0729-36/+36
|/ / / | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | Merge pull request #23806 from ↵Thomas Müller2016-04-073-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 themThomas Müller2016-04-072-11/+9
| | | |
| * | | Also use Javascript as language in l10n.pl - fixes #13924Thomas Müller2016-04-071-1/+18
| | | |
* | | | Merge pull request #23444 from owncloud/add-loading-spinnerJan-Christoph Borchardt2016-04-071-0/+19
|\ \ \ \ | | | | | | | | | | Add loading spinner to "Add to owncloud"
| * | | | add loading spinner to add to owncloud input fieldErik Pellikka2016-04-071-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update public.js Update public.js
* | | | | Merge pull request #23773 from owncloud/share_move_delete_user_hookJoas Schilling2016-04-0710-20/+317
|\ \ \ \ \ | |_|/ / / |/| | | | Migrate post_userDelete hook to share manager
| * | | | Migrate post_userDelete hook to share managerRoeland Jago Douma2016-04-0410-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-xxxThomas Müller2016-04-071-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove xxx from ownCloud we dont want to see that 🙈
| * | | | | Remove xxx from ownCloud we dont want to see that 🙈Joas Schilling2016-04-071-1/+0
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-07218-2206/+2702
| | | | |
* | | | | Merge pull request #23768 from owncloud/skjnldsv-color-generator-editJohn Molakvoæ2016-04-071-5/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | Updated color generator
| * | | | Updated color generatorJohn Molakvoæ2016-04-061-5/+23
|/ / / / | | | | | | | | | | | | Separated the main function to allow special use without dom manipulation.
* | | | Merge pull request #23766 from owncloud/replace-getid-3Lukas Reschke2016-04-062-6/+10
|\ \ \ \ | | | | | | | | | | Replace getid3 with ID3Parser
| * | | | Replace getid3 with ID3ParserLukas Reschke2016-04-062-6/+10
| | | | |
* | | | | Merge pull request #23822 from stweil/masterThomas Müller2016-04-068-11/+11
|\ \ \ \ \ | | | | | | | | | | | | tests: Fix typos (found by codespell)
| * | | | | tests: Fix typos (found by codespell)Stefan Weil2016-04-068-11/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix also a small grammar issue. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | | Merge pull request #23501 from owncloud/alarms_for_birthdayeventsThomas Müller2016-04-061-0/+5
|\ \ \ \ \ | | | | | | | | | | | | add VALARM for birthday events
| * \ \ \ \ Merge branch 'master' into alarms_for_birthdayeventsAchim Königs2016-03-26416-1162/+1320
| |\ \ \ \ \
| * | | | | | add VALARM for birthday eventsAchim Königs2016-03-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ACTION=DISPLAY *should* prevents audible alarms.
* | | | | | | Merge pull request #23823 from owncloud/drop-js-based-acceptance-testsThomas Müller2016-04-0630-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üller2016-04-0630-2344/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which are activly maintained
* | | | | | | | Merge pull request #23819 from owncloud/move-core-completely-to-psr4Roeland Douma2016-04-0660-4/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move OC/Core completely to PSR-4
| * | | | | | | | Remove OC/Core autoloading from old autoloaderLukas Reschke2016-04-062-4/+2
| | | | | | | | |
| * | | | | | | | Rename files to be PSR-4 compliantLukas Reschke2016-04-0658-0/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #23820 from owncloud/move-settings-completely-to-psr4Roeland Douma2016-04-0613-4/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move OC/Settings completely to PSR-4
| * | | | | | | | Remove OC/Settings from old autoloaderLukas Reschke2016-04-062-4/+2
| | | | | | | | |
| * | | | | | | | Rename files to be PSR-4 compliantLukas Reschke2016-04-0611-0/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #23777 from owncloud/ldap-null-userLukas Reschke2016-04-061-5/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Handle case where the user is not known
| * | | | | | | | Handle case where the user is not known - fixes #23759Thomas Müller2016-04-041-5/+7
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-066-0/+12
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #23818 from owncloud/use-proper-methodsJoas Schilling2016-04-067-11/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Use proper shortcut methods in templates
| * | | | | | | Use proper shortcut methods in templatesMorris Jobke2016-04-067-11/+11
|/ / / / / / /
* | | | | | | Merge pull request #23763 from owncloud/do_not_export_share_type_2Morris Jobke2016-04-061-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Share type 2 is private
| * | | | | | | Share type 2 is privateRoeland Jago Douma2016-04-041-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-endpointsThomas Müller2016-04-062-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üller2016-04-052-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know