Morris Jobke
28d77efe80
Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite
...
[Stable12] fix scss webroot and url rewrite
2018-01-05 17:29:08 +01:00
John Molakvoæ (skjnldsv)
b95d18b85e
Revert rebaseurl function edit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:35:38 +01:00
John Molakvoæ (skjnldsv)
7a282dee89
Rollback caching fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:34:32 +01:00
Julius Härtl
7bc63f6135
Fix faulty path in theming scss generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 08:17:39 +01:00
Nextcloud bot
a3933b99fe
[tx-robot] updated from transifex
2018-01-05 01:11:32 +00:00
Arthur Schiwon
0941781d1e
don't show recurring msg when pages result was turned off
...
and only as debug level otherwise.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:29:22 +01:00
Arthur Schiwon
32597f8966
test adoption for stable12
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:10:10 +01:00
John Molakvoæ (skjnldsv)
1f2437e2c5
Fixup! Proberly detect variable changes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:11:41 +01:00
John Molakvoæ (skjnldsv)
cf53560218
Proberly detect variable changes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:10:27 +01:00
John Molakvoæ (skjnldsv)
fa95733b0d
Fixed url rebase with theming
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 13:24:21 +01:00
Arthur Schiwon
7f0e4a5357
update autoloader
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 13:16:05 +01:00
Arthur Schiwon
e489a1a7c8
removes invalid tests, adapts another one
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:49:29 +01:00
Arthur Schiwon
776d9e6805
never translate login names when requiring with a user id
...
where appropriate, the preLoginNameUsedAsUserName hook should be thrown.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:47:31 +01:00
Arthur Schiwon
c94c2c48a6
extend tests for status quo
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:47:21 +01:00
Nextcloud bot
233fd16049
[tx-robot] updated from transifex
2018-01-04 09:48:45 +00:00
John Molakvoæ (skjnldsv)
51cc76b80d
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 08:35:38 +01:00
John Molakvoæ (skjnldsv)
1ae126a781
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv)
9fa49c7f24
Correctly remove temp test directory tree
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv)
87b1839cd1
Added tests for various installations types
...
- With root installation
- Core css
- App inside server root
- Secondary apps directory outside server root
- With an installation in a sub directory
- Core css
- App inside server root
- Secondary apps directory outside server root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
a46d45a652
Fixup! getWebdir return
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
89b6bc9424
Use OC_Util function for app web path
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
5008eb8f85
getWebDir function
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
00412d1c8c
Fixed webroot for scss files
...
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:59 +01:00
John Molakvoæ (skjnldsv)
f13b3b6651
Fixed scss url rewriting
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:08 +01:00
Julius Härtl
1d47410021
Fix height of table rows in apps management on IE11
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 17:12:16 +01:00
Julius Härtl
b96278f855
Remove css invert since we are using svg filters for now
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:24:35 +01:00
Julius Härtl
630d5db2cd
Fix icon rendering in apps management for IE11
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:22:58 +01:00
Julius Härtl
a3b6f05722
Invert app icons on IE11 as well
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:22:54 +01:00
Roeland Jago Douma
f9490505ad
Merge pull request #7672 from nextcloud/backport/6977/log-censor
...
[stable12] Added additional methods for removal of sensitive info
2018-01-03 12:54:56 +01:00
Roeland Jago Douma
ed5f66f11a
Do no run SyncJob in cron
...
Fixes #7184
The SyncJob can be very resource intensive. Since it requests all users
on the system to create the system addressbook. In order to do this it
creates a vcard for every user and updates the addressbook.
There is no need for this job since the proper signals are emitted and
handled in the carddav backend to update the addressbook live.
Worst comes to worst there is always the occ command to bring the
address book in sync again.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-03 10:58:16 +01:00
Joas Schilling
903d7fcd6a
Unit tests for #6977
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-03 10:46:30 +01:00
Johannes Schlichenmaier
a7e67a6ce2
Added additional methods for removal of sensitive info
...
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2018-01-03 10:46:04 +01:00
Daniel Calviño Sánchez
4d194b41f9
Fix drag shadow not visible when dragging a file on a narrow screen
...
When a file from the file list is dragged a drag shadow (a copy of the
file row that follows the cursor position) is created. The drag shadow
element is created as a direct child of the body element, so it needs a
higher "z-index" than the one used for the file list to be visible.
In narrow screens the "#app-content" uses a "z-index" of 1000 in order
to be visible over the "#navigation-bar" when they overlap, so the
"z-index" of the drag shadow must be at least 1000 to be visible over
the file list.
Instead of updating the hardcoded "z-index" it was removed and replaced
by CSS rules for ".dragshadow" elements to ease theming.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-02 16:12:47 +01:00
Morris Jobke
9ed0f50c25
Merge pull request #7567 from nextcloud/stable-12_fix7428
...
Respect sharing options when searching for Sharees
2017-12-20 14:18:33 +01:00
Roeland Jago Douma
4ed99dd54b
Merge pull request #7577 from nextcloud/7361_12
...
[stable12] check userExists later, saves lookups for appData_INSTANCEID userids
2017-12-19 15:51:32 +01:00
Arthur Schiwon
e788ae0cf6
check userExists later, saves lookups for appData_INSTANCEID userids
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-19 14:13:37 +01:00
Roeland Jago Douma
fe9f100a1b
Merge pull request #7568 from nextcloud/stable12-fix-duplicate-session-token
...
[stable12] Fix duplicate session token after remembered login
2017-12-19 13:33:35 +01:00
Christoph Wurst
85c18f5980
Fix duplicate session token after remembered login
...
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-12-19 09:17:06 +01:00
Tobia De Koninck
7f18a8d19f
Don't show users which e-mail address match if they belong to a group we may not share with
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-19 08:43:08 +01:00
Morris Jobke
6859e5a22a
Merge pull request #7558 from nextcloud/12-7427
...
[stable12] Fix email buttons for white theme
2017-12-18 21:19:51 +01:00
Morris Jobke
e726d191f1
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 17:03:01 +01:00
Morris Jobke
3a99ef5286
Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12
...
[12] Allow getting the filepath when getting cached mounts by fileid
2017-12-13 13:28:25 +01:00
Morris Jobke
93797b2e5d
Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12
...
allow 'Nextcloud' in the user agent string of Android
2017-12-12 15:44:55 +01:00
Bjoern Schiessle
1a4eab744e
fix dav unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:49 +01:00
Bjoern Schiessle
003c709d25
allow 'Nextcloud' in the user agent string of Android
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:36 +01:00
Robin Appelman
3ec1bbbde8
Allow getting the filepath when getting cached mounts by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-12 14:11:40 +01:00
Morris Jobke
f44d5bde56
Merge pull request #7456 from nextcloud/12_7342
...
[stable12] CardDAV convertor check should not be to wide
2017-12-12 10:04:40 +01:00
Roeland Jago Douma
4b60ada694
Merge pull request #7457 from nextcloud/stable12-7271
...
[stable12] Fix loading icon position in the app menu
2017-12-12 07:50:40 +01:00
Morris Jobke
77b58aeb16
Merge pull request #7455 from nextcloud/12_7230
...
[stable12] Remove wrong entry in admin_settings that causes 500
2017-12-11 22:45:25 +01:00
Julius Härtl
c023486845
Fix loading icon position in the app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-11 22:00:20 +01:00