mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,362 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

40362 Commits

Author SHA1 Message Date
Morris Jobke d21713d526 Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-name 
Fix naming of user id in email meta data
 2017-09-04 11:43:41 +02:00
Morris Jobke d5cba5eeaa Merge pull request #6221 from nextcloud/fav_share_api_fix 
Correctly format OCS response with favorites
 2017-09-04 08:46:09 +02:00
Morris Jobke ad5a298570 Merge pull request #6352 from nextcloud/scss-rebuild-frontend-controller 
Rebuild SCSS files if frontend controller value changes
 2017-09-03 20:59:25 +02:00
Morris Jobke 27644c7502 Merge pull request #6341 from nextcloud/jquery-ui-scss 
Use SCSS for jquery-ui-fixes
 2017-09-03 20:25:25 +02:00
Morris Jobke 92a440a0b5
Fix font color 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-03 18:32:44 +02:00
Julius Härtl b09ce70117
Rebuild SCSS files if frontend controller value changes 
fixes #6271
 2017-09-03 17:32:41 +02:00
Julius Härtl 99404fe5cd
Remove unnecessary files for jquery-ui-fixes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-03 15:34:04 +02:00
Morris Jobke 0f71e3fba2 Merge pull request #6344 from nextcloud/theming-invert-threshold 
Theming change invertion threshold to 55%
 2017-09-03 14:01:05 +02:00
Nextcloud bot fd075240a4
[tx-robot] updated from transifex 2017-09-03 00:08:15 +00:00
Julius Härtl 0a49757535
Change invertion threshold to 55% 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 21:48:14 +02:00
Julius Härtl 2fdc51ffdf
Use SCSS for jquery-ui-fixes 
- Move to SCSS so we use theming color values
- Apply tab style from files sidebar to ui-tabs (e.g. in user_ldap)
- Move select style to the jquery-ui-fixes file and make those only apply to ui-autocomplete elements

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 15:50:51 +02:00
Nextcloud bot 27c6dc9657
[tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Joas Schilling e47d627fc4
Fix naming of user id in email meta data 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-01 15:04:17 +02:00
Nextcloud bot 45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Roeland Jago Douma 84ea66dca8 Merge pull request #6296 from nextcloud/improve_2fa 
Improve 2FA
 2017-08-31 10:52:40 +02:00
Morris Jobke 77354cb7a2 Merge pull request #6315 from nextcloud/metadata-for-all-emails 
Implement metadata for email templates of remaining emails
 2017-08-31 09:54:31 +02:00
Nextcloud bot 99dcf5036d
[tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Morris Jobke 404bd1be60
Implement metadata for email templates of remaining emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 22:56:14 +02:00
Morris Jobke ee14659ae8 Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-name 
Allow to sort groups by name
 2017-08-30 22:01:10 +02:00
Morris Jobke d26ec44617
Add side effect note 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 21:16:27 +02:00
Roeland Jago Douma 969eea2c0d Merge pull request #6273 from nextcloud/move-multiple-files 
Move multiple files
 2017-08-30 14:23:05 +02:00
Morris Jobke 2aa9a9840e Merge pull request #5994 from nextcloud/drone_postgres_71 
Add drone step for postgres with php 7.1
 2017-08-30 14:03:59 +02:00
Roeland Jago Douma 7e065c2946
Add drone step for postgres with php 7.1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-30 13:55:16 +02:00
Nextcloud bot 1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Roeland Jago Douma 84b7022118
Improve 2FA 
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-29 20:27:36 +02:00
Morris Jobke 4edb261805 Merge pull request #6303 from nextcloud/background-image 
Adjust background image to the one used on the website
 2017-08-29 19:09:54 +02:00
Morris Jobke d86bb5aed8 Merge pull request #6301 from nextcloud/master-add-share-with 
Add shareWith to email template metadata
 2017-08-29 17:58:00 +02:00
Morris Jobke b2dd7bf045 Merge pull request #6302 from nextcloud/comradekingu-patch-1 
Spelling: Shortening and single please.
 2017-08-29 17:53:58 +02:00
Allan Nordhøy d6adc240c4 Spelling: Shortening and single please. 2017-08-29 16:10:54 +02:00
Morris Jobke 3cfe91bf0f
Add shareWith to email template metadata 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-29 16:09:25 +02:00
Jan-Christoph Borchardt 2e6d1a3453 Set primary action button color to same as theming color 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt badbab81ea Update background image to the one used on the website 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:04:11 +02:00
Joas Schilling 79a7b7f192 Merge pull request #6293 from nextcloud/less-user-enumeration 
Return the user id in case of an error
 2017-08-29 13:25:24 +02:00
Morris Jobke 7d8b7d4e4e Merge pull request #4925 from nextcloud/error-styling 
Improve design and wording of various error messages
 2017-08-29 12:03:16 +02:00
Roeland Jago Douma eea7de4c9f
Correctly format OCS response with favorites 
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-29 12:03:13 +02:00
Morris Jobke 8c917cbfe0 Merge pull request #6288 from nextcloud/master-6287 
Allow the expiration date to be set to null
 2017-08-29 11:32:11 +02:00
Joas Schilling 0aff1c9268
Return the user id in case of an error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-29 11:10:30 +02:00
Björn Schießle 5adc1efe9f Merge pull request #6283 from nextcloud/add-new-propfind 
add propfind to detect encryption status
 2017-08-29 10:47:33 +02:00
Nextcloud bot daf2d6cb96
[tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Morris Jobke be23f7e1de
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-28 17:49:16 +02:00
Bjoern Schiessle e83e1c7c23
add propfind to detect encryption status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-28 14:02:25 +02:00
Nextcloud bot 8e4085526d
[tx-robot] updated from transifex 2017-08-28 00:08:24 +00:00
Thomas Citharel 2af0c3d928 Move multiple files 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-08-27 15:20:18 +02:00
Roeland Jago Douma a17aba4e23 Merge pull request #6245 from nextcloud/postgres 
[Drone] Properly quote "7.0" in drone so it actually runs tests
 2017-08-27 14:13:44 +02:00
Roeland Jago Douma df268fef34
Properly quote 7.0 so drone handles it right 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-26 19:01:56 +02:00
Morris Jobke 34716f99a2 Merge pull request #6263 from nextcloud/scanner-exception-handling 
Better handling of errors durring scanning
 2017-08-26 19:00:52 +02:00
Robin Appelman 804d97d6ff
unlock file when an exception occurs during scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-26 18:58:06 +02:00
Robin Appelman 18908af87b
Dont swallow exception when inserting mimetypes if we're inside a transaction 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-26 18:58:06 +02:00
Morris Jobke 2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data 
Add meta information to emails for better customisation
 2017-08-26 18:53:52 +02:00
Morris Jobke 0b652648cc Merge pull request #6177 from nextcloud/properly-add-slo-url 
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
 2017-08-26 18:50:52 +02:00