summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* standardize datetime outputArthur Schiwon2016-01-291-1/+1
|
* Comments WebDAV adjustementsArthur Schiwon2016-01-299-7/+390
|
* Merge pull request #21701 from owncloud/scan_files_more_details_IIThomas Müller2016-01-291-38/+71
|\ | | | | occ scan:files Adding more details in the base print out (II)
| * occ scan:files Adding more details in the base print out (II)martin.mattel@diemattels.at2016-01-291-38/+71
| | | | | | | | | | | | | | | | | | | | | | | | Use proper method name Fixed the interruption logic Checks the availability of the pcntl_signal function Fixed typo crtl-c --> ctrl-c one overseen crtl-c typo
* | Merge pull request #21995 from owncloud/share2_delete_user_defined_group_sharesThomas Müller2016-01-292-65/+67
|\ \ | | | | | | [Share 2.0] When deleting a group share delete children
| * | [Share 2.0] When deleting a group share delete childrenRoeland Jago Douma2016-01-282-65/+67
| | | | | | | | | | | | | | | | | | For group shares we can have children. Those are custom shares when a user has moved or deleted a group share. Those also have to be deleted if the group share is removed.
* | | Merge pull request #21932 from owncloud/comments-dav-refinementsThomas Müller2016-01-294-8/+36
|\ \ \ | | | | | | | | provide info about plugin, and do not run commit ourselves on proppatch
| * | | provide info about plugin, and do not run commit ourselves on proppatchArthur Schiwon2016-01-264-8/+36
| | | |
* | | | Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-awayThomas Müller2016-01-294-37/+18
|\ \ \ \ | | | | | | | | | | Do not create a loop that generates thousands of jobs
| * | | | Remove other broken usages in deprecated methodsJoas Schilling2016-01-291-35/+3
| | | | |
| * | | | Deprecate the method and warn against using itJoas Schilling2016-01-282-0/+4
| | | | |
| * | | | Do not create a loop that generates thousands of jobsJoas Schilling2016-01-281-2/+11
| | | | |
* | | | | Merge pull request #21981 from owncloud/systemtags-trim-nameThomas Müller2016-01-291-5/+6
|\ \ \ \ \ | | | | | | | | | | | | Trim tag names to avoid problems
| * | | | | Trim tag names to avoid problemsJoas Schilling2016-01-281-5/+6
| | | | | |
* | | | | | Merge pull request #21993 from owncloud/updater-htaccesThomas Müller2016-01-291-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Do not rewrite requests to updater
| * | | | | Do not rewrite updater requestsVictor Dubiniuk2016-01-281-0/+1
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-29146-334/+50
| |/ / / |/| | |
* | | | Merge pull request #21333 from owncloud/migrate-contactsThomas Müller2016-01-2812-5/+650
|\ \ \ \ | |/ / / |/| | | Migrate contacts
| * | | Add copyright headerLukas Reschke2016-01-281-0/+19
| | | |
| * | | Fix sql to get shared addressbooks including unit testsThomas Müller2016-01-272-1/+17
| | | |
| * | | Unit testing database access to old contacts tablesThomas Müller2016-01-273-3/+267
| | | |
| * | | Unit testing migration logicThomas Müller2016-01-274-44/+176
| | | |
| * | | Add app to migrate contacts and calendarsThomas Müller2016-01-278-5/+219
| | | | | | | | | | | | | | | | | | | | | | | | Add group sharing migration Migrate all users
* | | | Merge pull request #21860 from owncloud/sharedialog-ocs-adapterVincent Petry2016-01-289-544/+617
|\ \ \ \ | |_|/ / |/| | | Share dialog use OCS API
| * | | Fix share default expiration date calculationVincent Petry2016-01-282-9/+8
| | | | | | | | | | | | | | | | Now using UTC dates with moment js to accurately add the number of days
| * | | Share dialog use OCS APIVincent Petry2016-01-288-537/+611
|/ / /
* | | Merge pull request #21975 from owncloud/fix_ocs_unit_testsThomas Müller2016-01-282-32/+32
|\ \ \ | | | | | | | | Fix OCS unit tests after two share merges
| * | | Fix OCS unit tests after two share mergesRoeland Jago Douma2016-01-282-32/+32
|/ / / | | | | | | | | | | | | * Use getNode * Return IShare object so typechecking is happy
* | | Merge pull request #21958 from owncloud/systemtags-styleThomas Müller2016-01-285-25/+46
|\ \ \ | | | | | | | | Use boxes for system tags, shorten permission text
| * | | Use boxes for system tags, shorten permission textVincent Petry2016-01-285-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permission text now doesn't appear when all permissions are there, or shows as "invisible" or "not assignable", which should better cover all use cases. Changed select2 style to use boxes in the input field.
* | | | Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_stringsThomas Müller2016-01-282-32/+744
|\ \ \ \ | | | | | | | | | | Share2 ocs fix passing empty strings
| * | | | [Share 2.0] Allow using permissions to update link shareRoeland Jago Douma2016-01-272-14/+113
| | | | |
| * | | | [Share 2.0] Still allow isolated updatesRoeland Jago Douma2016-01-272-11/+125
| | | | | | | | | | | | | | | | | | | | Still allow isolated updates of parameters
| * | | | [Share 2.0] Also handle empty parameter in updateShareRoeland Jago Douma2016-01-272-24/+283
| | | | | | | | | | | | | | | | | | | | | | | | | * More sanity checks * More unit tests
| * | | | [Share 2.0] When passing empty strings don't failRoeland Jago Douma2016-01-272-10/+250
| | | | | | | | | | | | | | | | | | | | | | | | | The password and expiration date can be set to empty strings when created. This is now handled gracefully.
* | | | | Merge pull request #21952 from owncloud/systemtags-fix-conflictsThomas Müller2016-01-282-3/+85
|\ \ \ \ \ | | | | | | | | | | | | Fix system tags conflict situations
| * | | | | Fix system tags conflict situationsVincent Petry2016-01-272-3/+85
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Does not disrupt the UX whenever a tag or association was created concurrently. The input field will adjust itself as if the tag was already there in the first place.
* | | | | Merge pull request #21851 from owncloud/shared-unreadableThomas Müller2016-01-288-548/+71
|\ \ \ \ \ | | | | | | | | | | | | Base shared cache on CacheJail
| * | | | | fix cachejail->updateRobin Appelman2016-01-281-1/+1
| | | | | |
| * | | | | cleanup shared cacheRobin Appelman2016-01-288-547/+70
|/ / / / /
* | | | | Merge pull request #21858 from owncloud/getMountsForFileIdThomas Müller2016-01-283-13/+205
|\ \ \ \ \ | | | | | | | | | | | | add IUserMountCache->getMountsForFileId
| * | | | | Fix failing oracle and postgres testsJoas Schilling2016-01-271-2/+2
| | | | | |
| * | | | | Use new constantsJoas Schilling2016-01-271-7/+8
| | | | | |
| * | | | | add IUserMountCache->getMountsForFileIdRobin Appelman2016-01-273-7/+198
| |/ / / /
* | | | | Merge pull request #21970 from zander/mentionbotThomas Müller2016-01-281-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Stop spamming me.
| * | | | | Stop spamming me.Tom2016-01-281-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honestly, the bot should be improved, if a person hasn't contributed for a long time it really doens't make sense to email him. I would also argue that altering the .gitignore doesn't make me an expert on that file. So classes of files really should not cause the mention bot spamming me.
* | | | | Merge pull request #21971 from owncloud/notify-meThomas Müller2016-01-281-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Notify me on activity and notifications for sure
| * | | | | More more more, kidding, just to be sureJoas Schilling2016-01-281-0/+9
|/ / / / /
* | | | | Merge pull request #21957 from owncloud/share2_to_ocpMorris Jobke2016-01-2819-632/+827
|\ \ \ \ \ | |/ / / / |/| | | | [Share 2.0] Move interfaces to OCP
| * | | | [Share 2.0] Remove setId and setProviderId from the interfaceRoeland Jago Douma2016-01-282-20/+0
| | | | | | | | | | | | | | | | | | | | Those should only ever be set by the providers
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 21:53:24 +0000