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

38456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
786258ff30
Send an email to the old address on email change 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:34:34 +02:00
Joas Schilling
1110b51aa3
Allow to read the old email on the hook as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:34:02 +02:00
Lukas Reschke
51377f3d8c Merge pull request #4313 from nextcloud/ldap-name-change 
Change LDAP method names
 2017-04-13 12:28:24 +02:00
Joas Schilling
0eb08a510b
Move logic into new class with DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:01:10 +02:00
Lukas Reschke
e39e6d0605
Remove expired attempts 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:18 +02:00
Lukas Reschke
31ae39c569
Add tests for multiple parameters 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:18 +02:00
Lukas Reschke
3d425ce833
Enable testing app in CI step 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:18 +02:00
Lukas Reschke
54930ac926
Update static autoloadermap 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
a1ae5275f9
Move to dedicated MiddleWare 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
a05471eb43
Fix .drone.yml 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
511524c668
Add isset() as it can be an empty result 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
d729bde98c
Register in ServerContainer 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:16 +02:00
Lukas Reschke
66835476b5
Add support for ratelimiting via annotations 
This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:16 +02:00
Lukas Reschke
23d9902cf3
Update CA bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 11:56:09 +02:00
Joas Schilling
49fd41b21f
Send an email on password change 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 11:49:02 +02:00
Roeland Jago Douma
5505faa3d7 Merge pull request #4340 from nextcloud/remove-invalid-route 
Remove invalid route
 2017-04-13 11:26:05 +02:00
Joas Schilling
f23a36b0a6
Add activities when email or password is changed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 11:13:19 +02:00
Lukas Reschke
06f8ea247b
Remove invalid route 
Said file doesn't exist anymore and accessing it would just return a 500

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 11:05:44 +02:00
Lukas Reschke
01f3698175 Merge pull request #3966 from nextcloud/downstream-26570 
Override config.php values through environment variables
 2017-04-13 10:51:09 +02:00
Morris Jobke
7cb6038fca Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login 
Dont create a log entry on email login
 2017-04-13 01:04:11 -05:00
Nextcloud bot
396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Lukas Reschke
7ebcc045a2 Merge pull request #4338 from nextcloud/handlebars-min 
Move to handlebars.min.js
 2017-04-12 23:14:12 +02:00
Roeland Jago Douma
3eb6f88019
Move to handlebars.min.js 
core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-12 22:22:38 +02:00
Morris Jobke
1f962f9115
Update email template for lost password email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 15:19:53 -05:00
Roeland Jago Douma
b3b24172e4 Merge pull request #4307 from nextcloud/sharing-emails 
New emails for sharebymail
 2017-04-12 21:23:11 +02:00
Lukas Reschke
72ff33da1d Merge pull request #4335 from nextcloud/jquery-ui-min 
Moved to jquery-ui.custom.min.js
 2017-04-12 20:58:05 +02:00
Morris Jobke
a7da2ef977 Merge pull request #4282 from nextcloud/oci-connect-string 
use the same oci connectstring in all code paths
 2017-04-12 13:11:00 -05:00
Roeland Jago Douma
abe887cd48
Moved to jquery-ui.custom.min.js 
Shaves off about 200kb of the default loaded js libs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-12 20:03:00 +02:00
Roeland Jago Douma
250eb34e81 Merge pull request #4306 from nextcloud/followup-3905 
Favorites integration tests for shared files
 2017-04-12 19:57:16 +02:00
Morris Jobke
124fdf8062 Merge pull request #4331 from nextcloud/query-builder-sum 
Add sum() to the query function builder
 2017-04-12 12:55:09 -05:00
Morris Jobke
ae4c2893a2
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 12:42:23 -05:00
Morris Jobke
4cf4d2f27e
Favorites integration tests for shared files 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 11:44:57 -05:00
Morris Jobke
31024b7700 Merge pull request #4329 from nextcloud/move-out-shared-folder 
Fix moving files out of a shared folder
 2017-04-12 11:44:26 -05:00
Joas Schilling
983210de2e
Dont add click-button text for plaintext mails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:27 +02:00
Joas Schilling
4b639e2763
No newlines when heading is empty 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:27 +02:00
Bjoern Schiessle
0a464dfb61
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-12 17:16:27 +02:00
Joas Schilling
1c8c62272c
Use instance name as alt-text 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +02:00
Morris Jobke
d0bae447fb
Use new email design for sharebymail emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Morris Jobke
33e077c1c1
Properly escape heading, body and button text 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Morris Jobke
050ce1d40b
Add addBodyButton to add a single button to email templates 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Morris Jobke
229d17e13b
Change LDAP method names 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 10:10:07 -05:00
Robin Appelman
ac45af68cd
Add sub() to the query function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-12 16:09:35 +02:00
Roeland Jago Douma
dccb8928a1 Merge pull request #4325 from nextcloud/downstream-27522 
Optimize put - Dont try to fetch filecache for not existing filecache…
 2017-04-12 16:04:03 +02:00
Björn Schießle
b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints 
Discover federatedsharing endpoints
 2017-04-12 16:01:07 +02:00
Roeland Jago Douma
3cf2f6e31b Merge pull request #4323 from nextcloud/downstream-27613 
Allow file upload when storage is unlimited
 2017-04-12 15:56:15 +02:00
Roeland Jago Douma
c996e91d59 Merge pull request #4324 from nextcloud/downstream-27581-27602 
Fix casing of same origin frame option
 2017-04-12 15:54:46 +02:00
Jan-Christoph Borchardt
37145a275f Fix AdBlock blocking share icon, ref #866 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-12 15:04:12 +02:00
Robin Appelman
8500debe79
use unjailed path when moving files out of a shared storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-12 14:56:51 +02:00
Robin Appelman
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-12 14:55:47 +02:00