Commit Graph

38761 Commits

Author SHA1 Message Date
Morris Jobke 5a9224fb4c Merge pull request #3531 from nextcloud/theming-scss
Theming using SCSS variables
2017-04-25 10:56:13 -03:00
Morris Jobke bcf587542c Merge pull request #4485 from nextcloud/translation-checker
Check whether we can json decode the translations
2017-04-25 10:46:51 -03:00
Morris Jobke dd5dbe3ebd
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-25 10:26:46 -03:00
Morris Jobke 6f2df5e495 Merge pull request #3195 from nextcloud/settings-apps-tabular
Make apps settings tabular
2017-04-25 10:25:29 -03:00
Arthur Schiwon 43f451e9e0
Fix usersInGroup retrieval
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 15:07:05 +02:00
Joas Schilling 7ea492b69a
Loop over the apps directory and add the task
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:35:51 +02:00
Joas Schilling f1ffb728b9
Allow meta info and icons
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
Roeland Jago Douma 82c9eb1c56 Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link
Fix sharing a password protected link
2017-04-25 14:12:44 +02:00
blizzz 026070a2fc Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login
Fix remember redirect_url on failed login attempts
2017-04-25 13:15:53 +02:00
Roger Szabo f1522a8dca 4190
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-25 19:06:49 +08:00
Arthur Schiwon 685faad5ca
fix method name due to changes in master
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 13:03:08 +02:00
Arthur Schiwon b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 2017-04-25 12:42:17 +02:00
Joas Schilling 6448cf5748
Mock it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 12:16:07 +02:00
Georg Ehrke 40eec1e63c
add repairstep with backgroundjob to index calendar data
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-25 11:55:31 +02:00
Joas Schilling bedd500884
Logo and background URLs must be relative
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:43:06 +02:00
Julius Härtl bc1efdf2e1
Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Härtl 1c54463853
Use theming cachebuster for server resources
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Haertl 68a63ad3f3
Implement scss variable injection by OC_Defaults
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
Joas Schilling 5be1010d45
Fix invalid character
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:06:27 +02:00
Joas Schilling dee2c8d23b
Check whether we can json decode the translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:01:34 +02:00
Christoph Wurst bb1d191f82
Fix remember redirect_url on failed login attempts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 09:38:19 +02:00
Xuanwo 8db21ad8c8 user_ldap: Add support for gidNumber
This patch is based on the work of @dleeuw (https://github.com/dleeuw)
(See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details).
The difference is user & group data will be written into cache to have
better performance, and functions splited from primaryGroupID series to
make them more readable.

Fixed https://github.com/nextcloud/server/issues/2640

Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-04-25 10:06:47 +08:00
Nextcloud bot 133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Jan-Christoph Borchardt 88bc43182f Fix app icon being inverted for app store apps too
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt f03e59530a Show spinner until app store images loaded
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt b48d81d59f Show placeholder for image-less apps in app management
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt cf588f03bf Center spinner in apps management
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Felix A. Epp 2fbf1114ac Add installed category in AppSettingsControlerTest
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:57 +02:00
Felix A. Epp 47d9bffc53 Make svgs more fluid and consistent remove action, instead of 'remove app'
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt a04413fd75 rename Uninstall to Remove
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt a392532e28 also improve layout of apps from store
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt bb436a4300 Revert "Add Minor styling improvements with opacity instead of grey"
This reverts commit e9f8a15692ccd4690eef9d4268343d59aa8491ea.

Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt b5a9c4e455 fix sizing and alignment of your app list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt 6e5f0e0d9d hide app version and level on narrower screens
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt ec96faead8 improve wording of Apps mgmt navigation entries
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Felix A. Epp c7d9e0ab22 Add Minor styling improvements with opacity instead of grey
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp d772e758ab Fix spacing between enbale-groups label and select2
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 5e5aa2eeeb Fix uninstall in tabular view
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp c51c41b2af Fix app-icon opacity and positioing
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 8496b36f0a Add a link to the appstore page in the installed apps settings categories
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 89ac71355d Add apps category 'all installed'
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 91a4676fc0 Make enabled and disabled apps a tabular list
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Georg Ehrke e760cda96f
remove unused CalendarSearchValidator
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-24 22:38:21 +02:00
Georg Ehrke 57b543a918
add Nextcloud Search extension to CalDAV
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-24 22:38:20 +02:00
Daniel Calviño Sánchez 58cc1251be Use "complete" callback in onPasswordEntered
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:18:52 +02:00
Daniel Calviño Sánchez e0b0115f99 Extract common ajax call for addShare and updateShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:07:08 +02:00
Daniel Calviño Sánchez 3ab2958930 Document options parameter in saveLinkShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:05:34 +02:00
Daniel Calviño Sánchez 6e9f49f397 Add "complete" callback support for addShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:31:53 +02:00
Daniel Calviño Sánchez 488020cf2e Add "complete" callback support for updateShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:24:30 +02:00
Daniel Calviño Sánchez 726c6c73f4 Add missing unit test cases and conditions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:24:05 +02:00