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

39047 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes 
Use automatic injection for appdata folders
 2017-05-10 17:31:05 -05:00
Morris Jobke
1c2ccd2206 Merge pull request #4798 from nextcloud/multibucket-root-fs 
Setup root FS for multibucket object storage
 2017-05-10 16:50:19 -05:00
Morris Jobke
d73c8d0981 Use distributed cache for SCSS dependencies as well 
* followup to #3978 because with the proper setup of
  appdata we now are using the same data on all nodes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-10 13:31:45 -05:00
Morris Jobke
74d742ba6d Setup root FS for multibucket object storage 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-10 13:21:35 -05:00
Morris Jobke
affa8d07ca Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn 
Add fallback to jQuery.fn.globalEval
 2017-05-10 11:37:06 -05:00
Roeland Jago Douma
f95f1b20f1 Merge pull request #4787 from nextcloud/missing-parameter 
Fix missing placeholder for doc link
 2017-05-10 14:44:24 +02:00
Lukas Reschke
486bfa5c78 Merge pull request #4788 from nextcloud/issue-4756-cron-error 
Fix errors with LookupServerConnector background job
 2017-05-10 13:22:40 +02:00
Lukas Reschke
93994b1320
Eval script elemtents in HTML body response 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-10 13:03:15 +02:00
Joas Schilling
d84a6ec3f3 Merge pull request #4771 from nextcloud/error-page-logo-css 
use the same logo css for the error page as the login page
 2017-05-10 12:10:38 +02:00
Joas Schilling
5c20d2ca8c
Use the configured lookup server 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 12:06:09 +02:00
Joas Schilling
266a1e88fa
Define method shouldRun 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 12:06:09 +02:00
Joas Schilling
253057355c
Fix missing placeholder for doc link 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 11:45:08 +02:00
Joas Schilling
538d32fe87
Automatic injection into the Fetchers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:56:38 +02:00
Joas Schilling
ca39940614
Automatic creation of Identity manager 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:45:11 +02:00
Joas Schilling
a8bb4a1898
Use automatic DI injection for UpdateLookupServer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:44:02 +02:00
Joas Schilling
d418ea550b
Automatic injection for CssController 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:42:40 +02:00
Joas Schilling
9c8fe82000
Automatic injection for JsController 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:42:15 +02:00
Morris Jobke
209b05489d Merge pull request #4770 from nextcloud/bugfix/4749/properties_table_propertyvalue_clob 
we can't predict the size of propertyvalue. text -> clob
 2017-05-10 00:20:57 -05:00
Nextcloud bot
fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Lukas Reschke
ec69980154 Merge pull request #4772 from nextcloud/fix-theming-background-preview 
Fix theming preview for background image
 2017-05-10 00:31:55 +02:00
Roeland Jago Douma
6a4734d78e Merge pull request #4702 from nextcloud/handle-user-folder-not-available 
Stop if user folder is not available
 2017-05-09 22:50:52 +02:00
Morris Jobke
b2c96d0c23 Stop if user folder is not available 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-09 11:26:08 -05:00
Julius Härtl
fb204de7f6
Fix theming preview for background image 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-09 18:21:41 +02:00
Robin Appelman
6a0f2fe52d Merge pull request #4737 from nextcloud/logo-icon-container 
fix sizing of logo in header
 2017-05-09 18:21:01 +02:00
Robin Appelman
694c9ad49c
use the same logo css for the error page as the login page 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-09 18:14:33 +02:00
Georg Ehrke
80eb3064e2
we can't predict the size of propertyvalue. text -> clob 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-09 18:12:50 +02:00
Roeland Jago Douma
b9bcc819bd Merge pull request #4758 from nextcloud/fix_3470 
Do not write and read rootcerts.crt at the same time
 2017-05-09 15:00:35 +02:00
Roeland Jago Douma
04a5c34cac Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment 
Fix mentioned user not clickable after posting or editing a comment
 2017-05-09 14:23:29 +02:00
Roeland Jago Douma
5a61a794d4
Do not write and read rootcerts.crt at the same time 
(Possibly) fixes #3470

When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.

For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results

And we don't want all the certificates to appear 2 times in there.

This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-09 13:00:07 +02:00
Roeland Jago Douma
46f7e8202f Merge pull request #4752 from nextcloud/fix-personal-settings-popover 
Fix privacy settings drop downs on personal settings page
 2017-05-09 12:15:20 +02:00
Lukas Reschke
62f2610129 Merge pull request #4736 from nextcloud/richdef-opengraph 
open-graph
 2017-05-09 11:15:55 +02:00
Joas Schilling
a089e08411
Add circle as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-09 10:45:10 +02:00
Roeland Jago Douma
07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload 
Proper exception for upload of .htaccess file via WebDAV
 2017-05-09 10:35:38 +02:00
Roeland Jago Douma
a06ef70c8f Merge pull request #4757 from nextcloud/fix/system-users-enumeration-contacts-menu 
Do not list system users in contacts menu if sharing autocompletion i…
 2017-05-09 10:34:37 +02:00
Morris Jobke
defb153ce3
Fix privacy settings drop downs on personal settings page 
* fixes #4672

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-09 10:16:23 +02:00
Maxence Lange
90b1c73e81 my name as author 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-09 07:14:52 -01:00
Maxence Lange
93e4bd3495 using title as name 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-09 07:10:16 -01:00
Christoph Wurst
56a9084dd2
Do not list system users in contacts menu if sharing autocompletion is disabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-09 08:45:36 +02:00
Roeland Jago Douma
dfa3aaa0c6 Merge pull request #4753 from nextcloud/fix-links-on-error-page 
Fix escaped HTML on error pages
 2017-05-09 08:45:11 +02:00
Roeland Jago Douma
684997f79c Merge pull request #4751 from nextcloud/wait-for-postgres 
Wait for Postgres to be available
 2017-05-09 08:44:28 +02:00
Roeland Jago Douma
888e719671 Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json 
Don't redirect requests to /core/img/manifest.json
 2017-05-09 08:43:35 +02:00
Nextcloud bot
37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot
43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke
d6c25748be Merge pull request #4755 from nextcloud/l10n-extraction 
Extract app name and navigation entries for l10n
 2017-05-08 23:25:20 -05:00
Morris Jobke
692e056df9 Extract app name and navigation entries for l10n 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 23:24:28 -05:00
Morris Jobke
9309217ecb Fix escaped HTML on error pages 
* fixes #4655

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 21:16:08 -05:00
Morris Jobke
f8044cbbce Proper exception for upload of .htaccess file via WebDAV 
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 20:03:41 -05:00
Nextcloud bot
f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Morris Jobke
e696b92297 Wait for Postgres to be available 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 17:57:49 -05:00
Lukas Reschke
ccd0ded812
Don't redirect requests to /core/img/manifest.json 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-09 00:02:37 +02:00