wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28692 commits 157 branches 562 tags 714 MiB
Commit graph

11869 commits

Author SHA1 Message Date
Thomas Müller
e1bf50edd2 Merge pull request #20905 from owncloud/allow-framing-itself 
Allow framing 'self'
 2015-12-02 21:55:12 +01:00
Thomas Müller
09600058d0 Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff 
Replace old config code with usage of proper APIs
 2015-12-02 21:54:42 +01:00
Lukas Reschke
8aaab0dbad Allow framing 'self' 
This is required by the pdf viewer, since the files app on master uses the AppFramework it had applied the more strict defaults which made it not work on master.
 2015-12-02 17:30:40 +01:00
Thomas Müller
df5872ec50 Merge pull request #20719 from owncloud/adding-system-addressbook-of-users 
Adding system addressbook for users of this instance - a occ command …
 2015-12-02 16:17:58 +01:00
Morris Jobke
37ecde065b Replace old config code with usage of proper APIs 2015-12-02 15:56:59 +01:00
Thomas Müller
28ceab2f61 Fix endless recursion 2015-12-02 14:44:41 +01:00
Thomas Müller
8d218bf3ef Merge pull request #20875 from owncloud/remove-changepropagator 
remove old propagation logic
 2015-12-02 13:03:31 +01:00
Thomas Müller
f558ac7dd5 Fix update of avatar image 2015-12-02 11:09:15 +01:00
Thomas Müller
d4abbb10d3 Merge pull request #20884 from owncloud/fix_20713 
Respect disabled incoming federated shares
 2015-12-02 10:56:59 +01:00
Thomas Müller
4c695e63c0 Fix comments 2015-12-02 09:20:58 +01:00
Thomas Müller
6abc02cb88 Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends 2015-12-02 09:14:41 +01:00
Thomas Müller
599ba31edc Specify the email type and set name properly 2015-12-02 09:14:41 +01:00
Thomas Müller
906777dc9c Add converter to generate/update a vcard from a given user 2015-12-02 09:14:41 +01:00
Thomas Müller
1e8ad65288 Add system principal to cal of each card 2015-12-02 09:14:41 +01:00
Thomas Müller
df6fc6cc70 Add the user's cloud id to the vCard 2015-12-02 09:14:41 +01:00
Thomas Müller
7c8a84e7ac Add user's email address to vCard 2015-12-02 09:14:41 +01:00
Thomas Müller
079ae9b7a9 Update addressbook home configuration for CalDAVTester 2015-12-02 09:14:41 +01:00
Thomas Müller
6a2dde6400 user and system addressbooks are now living in sub folders 2015-12-02 09:14:41 +01:00
Thomas Müller
dcfd089a6c Adding a second principal backend which holds system principals - as of now only one principals/system/system 2015-12-02 09:14:41 +01:00
Thomas Müller
dad6470baa Add IUser::getAvatarImage() for easy access 2015-12-02 09:14:41 +01:00
Thomas Müller
c91192fb73 Adding system addressbook for users of this instance - a occ command is supplied for synchronizing 2015-12-02 09:08:27 +01:00
Roeland Jago Douma
1e19661daa [Sharing] Respect disabled incoming federated shares 
Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713
 2015-12-02 09:00:21 +01:00
Jenkins for ownCloud
4f4b91a9ec [tx-robot] updated from transifex 2015-12-02 02:00:28 -05:00
Robin Appelman
62cc316c6a remove old propagation logic 2015-12-01 16:50:20 +01:00
Thomas Müller
27da63886f Merge pull request #20710 from owncloud/files_external_config_command 
Add command to get and set config for external mounts
 2015-12-01 15:27:32 +01:00
Robin Appelman
1347e3332b return non 0 status code in case of missing mount 2015-12-01 13:47:56 +01:00
Robin Appelman
2dd0066b0e Add command to set mount options for external storages 2015-12-01 13:47:32 +01:00
Robin Appelman
d5ffbc9401 Add command to get and set config for external mounts 2015-12-01 13:47:32 +01:00
Morris Jobke
0655f3d102 Revert "Fix column width of mtime column" 2015-12-01 13:45:30 +01:00
Thomas Müller
634859e6ed Merge pull request #20825 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-12-01 09:26:22 +01:00
Jenkins for ownCloud
8421a43df1 [tx-robot] updated from transifex 2015-12-01 01:55:07 -05:00
Thomas Müller
d6da0396d0 Adjust patches 2015-11-30 23:00:51 +01:00
Scrutinizer Auto-Fixer
dcbd603514 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-11-30 22:50:09 +01:00
Thomas Müller
802f226d8a Merge pull request #20842 from owncloud/fix-date-time-column 
Fix column width of mtime column
 2015-11-30 22:47:36 +01:00
Thomas Müller
060673a8b3 Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favorites 
Activity oracle sql error for favorites
 2015-11-30 22:43:06 +01:00
Thomas Müller
63a87c631b Merge pull request #20843 from owncloud/fix-share-with-input 
Fix the width of the share with input
 2015-11-30 17:38:27 +01:00
Joas Schilling
23046ca5b7 Inject the database connection 2015-11-30 17:14:47 +01:00
Joas Schilling
e9094b8a41 Only require the interface 2015-11-30 17:14:47 +01:00
Joas Schilling
6e0596432c Add a unit test that executes the query 2015-11-30 17:14:47 +01:00
Joas Schilling
2cdec74e8a Correctly escape the paths so we only display favorites instead of wildcards 2015-11-30 17:12:48 +01:00
Joas Schilling
623d34972d Oracle can not return statements but only values 
So evaluate the condition directly and return 1 or 0
 2015-11-30 17:12:48 +01:00
Thomas Müller
b9faba8857 Merge pull request #20837 from owncloud/fix-mountoptions-dropdown 
Fix ext storage mount options dropdown
 2015-11-30 16:53:26 +01:00
Morris Jobke
00fcb95d86 Fix the width of the share with input 
* the ID of this has changed to #shareWith-viewNUMBER and shouldn't
  be used in CSS
* now uses the proper classes
 2015-11-30 16:46:51 +01:00
Morris Jobke
11d2d7a1bb Fix column width of mtime column 
* in some translations (e.g. german) the header of this column otherwise
  got truncated
  "Zeitpunkt der Freigabe" vs "Zeitpunkt der Freig"
 2015-11-30 16:29:15 +01:00
Thomas Müller
fd79511d68 Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdav 
Fix public link getDownloadUrl to return Webdav public link
 2015-11-30 15:07:36 +01:00
Vincent Petry
dc962a1203 Fix ext storage mount options dropdown 2015-11-30 14:59:06 +01:00
Thomas Müller
318e5e2864 More group DB 2015-11-30 10:55:13 +01:00
Thomas Müller
f9fc254672 Add DB group to some files_external tests 
Adding group Db to federation tests and ldap tests

Add group DB to Test_UrlGenerator

Adding group DB to trashbin and versions tests

Adding group DB to Test_Util_CheckServer for pg
 2015-11-30 10:55:10 +01:00
Thomas Müller
757aa45db7 Adding more DB groups to test suits 
Adding more DB groups to test suits
 2015-11-30 10:55:06 +01:00
Thomas Müller
e265e982bf External storage tests require DB as well 2015-11-30 10:55:05 +01:00