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

6401 commits

Author SHA1 Message Date
Bjoern Schiessle
cdf01feba7
add action to existing brute force protection 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-18 15:25:16 +01:00
Nextcloud bot
4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Björn Schießle
61c68d4ebe Merge pull request #3114 from nextcloud/menuitem-fix 
Add menuitem to popover menu
 2017-01-17 11:12:49 +01:00
Joas Schilling
aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions 
Markdown support for app descriptions
 2017-01-17 11:11:16 +01:00
Christoph Wurst
012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs 
Filter out sensitive appconfig values
 2017-01-17 11:01:42 +01:00
John Molakvoæ
75587cf135 Add menuitem to popover menu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-17 10:11:08 +01:00
Christoph Wurst
86a5d5b399
fix show-more-icon position 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-17 09:23:59 +01:00
Nextcloud bot
b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Nextcloud bot
203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Lukas Reschke
6a047a045a
Apply DOMPurify over HTML 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-13 18:58:18 +01:00
Joas Schilling
e7a2151c4d
Add marked 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
John Molakvoæ
8d8aff1bce Merge pull request #3024 from nextcloud/apps-scss-optimisation 
Apps scss optimisation
 2017-01-13 16:31:16 +01:00
John Molakvoæ
127024d89d Merge pull request #3048 from nextcloud/share-scss-optimisation 
Share scss optimisation
 2017-01-13 16:03:17 +01:00
John Molakvoæ (skjnldsv)
ce9c833c5b
App navigation utils button fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-13 15:31:42 +01:00
Joas Schilling
0f792fedef Merge pull request #3060 from nextcloud/cleanup-js-tests 
Cleanup js tests
 2017-01-13 14:47:06 +01:00
Christoph Wurst
da28a1612e expect warning to be shown 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:33:12 +01:00
Morris Jobke
622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements 
create new encryption keys on password reset and backup the old one
 2017-01-13 11:28:43 +01:00
Christoph Wurst
9d56d5e94d add spies for l10n warnings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:20:19 +01:00
John Molakvoæ (skjnldsv)
0ec6ea5ace
Copyright and code format 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 19:49:09 +01:00
John Molakvoæ (skjnldsv)
052eb98c18
Header scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 15:18:21 +01:00
John Molakvoæ (skjnldsv)
bab09dc5d4
Share scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 15:02:14 +01:00
Nextcloud bot
09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
John Molakvoæ (skjnldsv)
67c4f3d07c
App-navigation action layout fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 21:01:54 +01:00
Christoph Wurst
140555b786
always allow remembered login 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
John Molakvoæ
fab82e9780 Merge pull request #3029 from nextcloud/systemtags-scss-optimisation 
Systemtags scss optimisation
 2017-01-11 18:41:14 +01:00
John Molakvoæ (skjnldsv)
dda4b3b272
Fix padding if empty button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 18:37:59 +01:00
John Molakvoæ
3463c134a9 Merge pull request #3027 from nextcloud/multiselect-scss-optimisation 
Multiselect scss optimisation
 2017-01-11 18:24:15 +01:00
Morris Jobke
b6c00a3f51 Merge pull request #3026 from nextcloud/icons-scss-optimisation 
Icons scss optimisation
 2017-01-11 16:52:27 +01:00
Roeland Jago Douma
96d2f2f124 Merge pull request #3028 from nextcloud/tooltip-scss-optimisation 
Tooltip scss optimisation
 2017-01-11 16:38:18 +01:00
Nextcloud bot
c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
John Molakvoæ (skjnldsv)
dfee6ffaca
Systemtags scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:38:35 +01:00
John Molakvoæ (skjnldsv)
2899f34c4c
Tooltip scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:33:11 +01:00
John Molakvoæ (skjnldsv)
8317a71fee
Multiselect scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:22:19 +01:00
John Molakvoæ (skjnldsv)
2a2d4390c6
Comments and delete icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:16:05 +01:00
John Molakvoæ (skjnldsv)
27a1dadea4
Loader and animation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:12:39 +01:00
John Molakvoæ (skjnldsv)
c87d48700c
Second optimisation and readability 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
735423e399
Copyright 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
3e36899778
Comments and cleanup 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
5b4d5aba41
Quote fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:41 +01:00
John Molakvoæ (skjnldsv)
2d56cceb87
popover menu restructuration & unification 
fix #2798

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:15 +01:00
Joas Schilling
ce7836378c
Filter out sensitive appconfig values 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-11 11:42:36 +01:00
Christoph Wurst
243c9c0941
fix coding style and increase code coverage 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 11:01:54 +01:00
Cornelius Kölbel
e077e01bf2
Add a TwoFactorException 
A Two Factor third party App may throw a TwoFactorException()
with a more detailed error message in case the authentication fails.
The 2FA Controller will then display the message of this Exception
to the user.

Working on #26593

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-11 11:01:52 +01:00
John Molakvoæ (skjnldsv)
ef9e2e4e7d
Added loader and fixed tabs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 17:57:25 +01:00
John Molakvoæ (skjnldsv)
e4b3ba6590
Create unified css file and merge all needed data into this file 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 17:50:29 +01:00
Bjoern Schiessle
fcda3a20f4
create new encryption keys on password reset and backup the old one 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-10 17:04:32 +01:00
John Molakvoæ (skjnldsv)
96d355984d
Revert styles scss changes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 11:24:06 +01:00
John Molakvoæ (skjnldsv)
67467873c2
Removed jquery scss 
- Switched to setup.css
- Disable scss when displaying the update page
- Improved setup css
- Fixed loading failure of other styles on setup & update page
- Improved scss compiler with an ignore scss compilation option

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 11:06:03 +01:00
Nextcloud bot
4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Roeland Jago Douma
6347d97c7f Merge pull request #2512 from nextcloud/cleanup-system-tag-usage 
Only allow admins to delete tags
 2017-01-06 16:17:09 +01:00
Roeland Jago Douma
ae934cbdab Merge pull request #2966 from nextcloud/ldif-mime-support 
recognize LDIF (and schema) file types
 2017-01-06 14:42:17 +01:00
Morris Jobke
5e02c7f7bd
Theme update pages via CSS 
* SCSS on-the-fly generation isn't allowed during update
* fallback to plain CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-06 12:36:16 +01:00
Arthur Schiwon
68a0f8e153
recognize LDIF (and schema) file types 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-01-06 12:25:16 +01:00
Roeland Jago Douma
350b7ebc86
Adds CssControllerTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
e1f018838e
Updated installation css for config error and update 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
a44c5244c3
Removed old css files 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv)
1c128e9391
Tooltip scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:15 +01:00
John Molakvoæ (skjnldsv)
5b302a9a67
Systemtags scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
59731acf38
Styles scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
f4ac735f98
Share scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
4cda23bb6a
Multiselect scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
62acac9b80
Jquery-ui-fixes scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
03fb2330a1
Inputs scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
6b35525c3c
Icons scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
0b51bd0a32
Header scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
a2c3d6c15a
Apps scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
Roeland Jago Douma
1e44a15dd1
No need for the CssManager 
* It is a simple wrapper we can always add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
bd5bcd2d8d
Installation css & template edit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv)
763814f057
Css installation page fallback 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
Roeland Jago Douma
95d85ba8eb
Do not add ICssManager to OCP 
We can add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:13 +01:00
Roeland Jago Douma
2816177ecb
Code cleanup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
6380d503af
Css cache folder name fix, route fix and various fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
3b62003c9c
Injection fix and log appname fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
1caaa7f4cd
Appdata integration 2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
Joas Schilling
ba7f5105f0 Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldap 
Use login name to fix password confirm with ldap users
 2017-01-05 15:15:04 +01:00
Nextcloud bot
d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Joas Schilling
2f21eaaf47
Use login name to fix password confirm with ldap users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 12:17:30 +01:00
Morris Jobke
9dbcc1a177 Merge pull request #2933 from nextcloud/dont-link-to-oc-forum 
Don't link to the oC forum
 2017-01-04 13:22:54 +01:00
Nextcloud bot
2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Joas Schilling
5533c77b91
Don't link to the oC forum 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-04 12:44:10 +01:00
Roeland Jago Douma
fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603 
Fixed size issues on main detail view and disappearing of share recipients (#26603)
 2017-01-02 21:19:43 +01:00
Nextcloud bot
0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot
02eb0f7fa4
[tx-robot] updated from transifex 2016-12-31 01:08:36 +00:00
Nextcloud bot
fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Nextcloud bot
52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Robin Appelman
75747c5d2f Merge pull request #2854 from nextcloud/2fa-redirect-url 
Set redirect_url on 2FA challenge page
 2016-12-28 16:28:08 +01:00
Nextcloud bot
b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Lukas Reschke
2cd92da733 Merge pull request #2821 from nextcloud/added-hint-for-specifying 
Fix #24219: Added hint for specifying a port. (#26860)
 2016-12-27 13:46:29 +01:00
Nextcloud bot
bd20139f55
[tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot
3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Christoph Wurst
eff904473d
Set redirect_url on 2FA challenge page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-23 20:53:26 +01:00
Michael Jobst
969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603) 
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-23 16:56:55 +01:00
Vincent Petry
14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Sourav Badami
3dc562bb7a
Fix #24219: Added hint for specifying a port. (#26860) 
* Added hint for specifying a port.

* Minor changes.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 15:55:09 +01:00
Morris Jobke
998f235474 Merge pull request #2563 from nextcloud/fix-password-reset 
fix password reset if encryption is enabled
 2016-12-22 11:18:04 +01:00
Lukas Reschke
091bf07385 Merge pull request #2724 from nextcloud/fix-23591 
[downstream] Report failures for SignApp and SignCore
 2016-12-21 13:03:13 +01:00
Nextcloud bot
f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Patrick Paysant
d4c088cb79
Verify input, add more unit tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:20 +01:00
Patrick Paysant
ec4bca619d
Add test for unparseable string 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:13 +01:00
Patrick Paysant
ff018d48cf
Implements all comments from @PVince81 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:05 +01:00
Patrick Paysant
6217393d6a
Adding computerFileSize in OC.Util 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:28:58 +01:00
Joas Schilling
eed0eaeb86
Use a form so firefox doesn't try to save the space as a password 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-19 12:43:31 +01:00
Roeland Jago Douma
f54547ff1c Merge pull request #2723 from nextcloud/integrity-exit-code 
[downstream] Return 1 if integrity check is failed. Fixes #22806
 2016-12-19 08:37:43 +01:00
Julius Haertl
1ad3613307
Adjust shadows and fix positioning 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-17 20:06:19 +01:00
Victor Dubiniuk
876754a5a5
Check return value for file_put_contents. Add return value to the commands 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:50:58 +01:00
Victor Dubiniuk
93a8eba137
Return 1 if integrity check is failed. Fixes #22806 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:48:37 +01:00
Lukas Reschke
9aef75cb36 Merge pull request #2398 from nextcloud/fix-2368 
flicker-free permission change in share dialog
 2016-12-16 13:35:33 +01:00
Nextcloud bot
0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Lukas Reschke
49473dee85 Merge pull request #2582 from nextcloud/callback-alos-on-close 
Fire callback also on pure closing of prompt dialog
 2016-12-09 13:44:53 +01:00
Morris Jobke
ec52286a0f
Fire callback also on pure closing of prompt dialog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-09 12:52:46 +01:00
blizzz
e3b2832ee1 Merge pull request #2561 from nextcloud/save-timezone-on-login 
Save the timezone on login again
 2016-12-09 10:37:52 +01:00
Nextcloud bot
88d90066ba
[tx-robot] updated from transifex 2016-12-09 01:07:18 +00:00
Joas Schilling
3472f70ffe Merge pull request #2515 from nextcloud/tag-rename-styling 
fix styling of renaming system tags
 2016-12-08 14:05:06 +01:00
Roeland Jago Douma
158cc9c261 Merge pull request #2545 from nextcloud/fix-popover-width 
Fix popover width
 2016-12-08 13:49:56 +01:00
Bjoern Schiessle
16bbd3fd7c
fix password reset if encryption is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-08 12:08:05 +01:00
Joas Schilling
924358ef96
Save the timezone on login again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-08 10:45:24 +01:00
Arthur Schiwon
f29f4d9c3a
fix rendering for mail shares 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
3ac8d422de
disable checkboxes during save op to avoid race conditions 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
056e59af7e
fix some coding style and stricter comparisons, makes scrutinizer happier 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
39c2d9e663
also handle can-edit change 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
2514176e41
flicker-free permission change in share dialog 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
John Molakvoæ (skjnldsv)
2eca4e65b3
Fix popover margin and width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-07 10:50:54 +01:00
blizzz
c776aa9282 Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder 
fix change permission on mail shares of folders
 2016-12-06 22:53:46 +01:00
Joas Schilling
9ea432f88c
Adjust the JS unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-06 17:50:57 +01:00
Joas Schilling
b8e9d255d3
Only allow admins to delete tags 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-06 16:30:21 +01:00
Arthur Schiwon
c2062a93a3
set different permissions if file or folder 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 15:41:10 +01:00
Robin Appelman
d9ae68eca6
fix rename input positioning in ff 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-06 15:32:46 +01:00
Arthur Schiwon
02f26751ce
set full edit permissions 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 15:22:33 +01:00
Arthur Schiwon
9c249427d1
fix change permission on mail shares of folders 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 13:44:27 +01:00
John Molakvoæ (skjnldsv)
0abcba25e8
Fix db selection design and fix #2511 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-06 09:56:00 +01:00
Roeland Jago Douma
db6359d1e4 Merge pull request #2513 from nextcloud/fix-htaccess-checks 
Properly check the data dir
 2016-12-06 08:57:36 +01:00
Nextcloud bot
2a647f4d3a
[tx-robot] updated from transifex 2016-12-06 01:07:19 +00:00
Morris Jobke
a2867c0664
Properly check the data dir 
* fixes #1364

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-05 23:35:35 +01:00
Lukas Reschke
60d1e8e63e
Check for nextcloud version as well 
The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-05 22:18:24 +01:00
Robin Appelman
fe31b45934
float tooltip over select2 dropdown 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-05 17:59:16 +01:00
Robin Appelman
fccddb8787
fix styling of renaming system tags 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-05 17:54:38 +01:00
Morris Jobke
efa9ac1230 Merge pull request #2508 from nextcloud/systemtags-dropdown-style 
improve systemtags selector styling
 2016-12-05 16:12:30 +01:00
Morris Jobke
8fdfb41b93 Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-top 
Move lately used tags to the top
 2016-12-05 16:10:33 +01:00
Robin Appelman
d6c9cc7e03
improve systemtags selector styling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-05 14:59:14 +01:00
Morris Jobke
9eb1ea41ce Merge pull request #2428 from justin-sleep/upstream 
Fix #2427 by converting $remember to integer
 2016-12-03 11:10:22 +01:00
Nextcloud bot
181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
Lukas Reschke
5a3a776af9 Merge pull request #2482 from nextcloud/fix-loading-icon-size 
Fix loader size to 32px and 16px
 2016-12-02 22:10:15 +01:00
justin-sleep
25a5c655f7 Move integer casting to the top of the chain 
Signed-off-by: justin-sleep <justin@quarterfull.com>
 2016-12-02 14:07:45 -06:00
Morris Jobke
95243f49b6 Merge pull request #2490 from nextcloud/updated-gif-loader 
Fix gif loader to fit css design, fix #1825
 2016-12-02 20:03:35 +01:00
John Molakvoæ (skjnldsv)
890e25f7da
Fix gif loader to fit css design 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-02 19:38:31 +01:00
John Molakvoæ (skjnldsv)
b5392b8642
Fix loader size to 32px and 16px 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-02 18:04:03 +01:00
John Molakvoæ (skjnldsv)
8a12f0bc8f
Fix unshare delete icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-02 17:52:24 +01:00
Morris Jobke
db56df1893 Merge pull request #2469 from nextcloud/fix-loading-icon-background 
Remove white background from loading icon
 2016-12-02 15:53:38 +01:00
Robin Appelman
bc597b1843 Merge pull request #2448 from nextcloud/errorreload-login 
only reload on errors when logged in
 2016-12-02 14:37:12 +01:00
Robin Appelman
e055fbd4da
adjust js tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 13:40:23 +01:00