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

6951 commits

Author SHA1 Message Date
Joas Schilling
d84a6ec3f3 Merge pull request #4771 from nextcloud/error-page-logo-css 
use the same logo css for the error page as the login page
 2017-05-10 12:10:38 +02:00
Joas Schilling
ca39940614
Automatic creation of Identity manager 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:45:11 +02:00
Joas Schilling
d418ea550b
Automatic injection for CssController 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:42:40 +02:00
Joas Schilling
9c8fe82000
Automatic injection for JsController 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:42:15 +02:00
Robin Appelman
6a0f2fe52d Merge pull request #4737 from nextcloud/logo-icon-container 
fix sizing of logo in header
 2017-05-09 18:21:01 +02:00
Robin Appelman
694c9ad49c
use the same logo css for the error page as the login page 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-09 18:14:33 +02:00
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Morris Jobke
df6ce6b385 Merge pull request #4675 from nextcloud/fix_4651 
Create a photo cache to speedup the contactsmenu
 2017-05-08 12:20:27 -05:00
Lukas Reschke
157be421a9 Merge pull request #4740 from nextcloud/external-moved-to-appstore 
External has been moved to appstore
 2017-05-08 17:48:25 +02:00
Lukas Reschke
dcfd1f5b48
External has been moved to appstore 
As discussed with Joas.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 15:46:09 +02:00
Lukas Reschke
26f7a3b462
Check if Nextcloud is installed 
Fixes https://github.com/nextcloud/server/issues/4735

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 15:10:53 +02:00
Robin Appelman
02f3b74409
fix sizing of logo in header 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-08 15:08:30 +02:00
Lukas Reschke
4d101ca2be Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection 
Automatic mysql 4byte detection
 2017-05-08 12:18:40 +02:00
Lukas Reschke
fecf72fb70 Merge pull request #4632 from nextcloud/login-logo-ratio 
show non landscape logos bigger on the login page
 2017-05-08 12:11:15 +02:00
Roeland Jago Douma
34d97aa51c
Request proper size for contacts menu 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Nextcloud bot
619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Mario Danic
e4aac15a92
Update login flow redirection 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-04 19:21:22 +02:00
Christoph Wurst
fb3ac32915 Merge pull request #4694 from nextcloud/fix_4676 
Load proper fonts in guest.css
 2017-05-04 17:21:07 +02:00
Roeland Jago Douma
1a8befa447
Load proper fonts in guest.css 
Fixes #4676

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 13:42:58 +02:00
Roeland Jago Douma
2216e5dcd0
Fix event firing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 09:22:28 +02:00
Felix A. Epp
6f2cc42885 Add radio class to read/write sharing options and 1px left adjustment 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-05-04 01:34:29 +02:00
Felix A. Epp
758576f608 Fix read-only label id 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-05-04 01:33:03 +02:00
Roeland Jago Douma
2e32ab945b Make files drop more permanent 
Implement the suggestions from #2207

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 00:30:51 +02:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
Roeland Jago Douma
24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling 
better handling of preview generation errors
 2017-05-02 21:49:14 +02:00
Roeland Jago Douma
6d9cb62f79 Merge pull request #4611 from nextcloud/js-use-dot-notation 
Use dot notation for array access - JSLint recommendation
 2017-05-02 21:44:44 +02:00
Robin Appelman
c50b7addc7
smaller max logo sizes and cleaner code 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-02 13:01:11 -03:00
Morris Jobke
23cc309606
Handle more error cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:48 +02:00
Lukas Reschke
94c2f12226 Merge pull request #4638 from nextcloud/fix-copy-tooltip 
Fix "Copied" message for public links
 2017-05-02 10:10:23 +02:00
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Morris Jobke
2ce71f8c24
Fix "Copied" message for public links 
* share a file/fodler by public link and click the
  copy to clipboard icon and watch the tooltip
* before: it said "Copy"
* after: it now says "Copied" after clicking the button

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 17:58:12 -03:00
Lukas Reschke
72dd4425c9 Merge pull request #4626 from nextcloud/adjust-shipped-json 
Remove apps delivered from the appstore
 2017-05-01 20:49:43 +02:00
Lukas Reschke
8cb3115acf Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity 
Remove abandoned methods in OC.Share that refer to old API endpoints
 2017-05-01 20:44:19 +02:00
Roeland Jago Douma
4904117ba8 Merge pull request #4612 from nextcloud/js-fix-long-lines 
Fix some long lines in JS - JSLinut recommendation
 2017-05-01 19:55:56 +02:00
Roeland Jago Douma
92b73db053 Merge pull request #4613 from nextcloud/remove-unused 
Remove unused JS file
 2017-05-01 19:42:12 +02:00
Robin Appelman
fa52f906e3
show non landscape icons bigger on the login page 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 19:05:21 +02:00
Lukas Reschke
0329adbc61 Merge pull request #4599 from nextcloud/contactsmenu-mobile 
Define max-width for Contacts menu for mobile
 2017-05-01 18:05:52 +02:00
Lukas Reschke
4a05ca46d3 Merge pull request #4598 from nextcloud/menu-flashing 
Prevent flashing of apps and user menu on page load
 2017-05-01 18:04:51 +02:00
Lukas Reschke
a2f6fea408 Merge pull request #4610 from nextcloud/js-semicolons 
Fix semicolon at end of JS lines
 2017-05-01 16:55:35 +02:00
Lukas Reschke
99f98ca343 Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate 
Fix variable definitions in oc dialogs
 2017-05-01 16:54:53 +02:00
Lukas Reschke
a3546b0ec0
Remove apps delivered from the appstore 
Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature.

Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore.

Fixes https://github.com/nextcloud/server/issues/4605

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 16:47:58 +02:00
Morris Jobke
23858504eb
Fix variable definition in sharedialogview.js 
* improves readability of conditional statements
  and fixes warning in JSLint for varibale definition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:32:54 -03:00
Morris Jobke
4cd8b3379b
Remove unused methods from OC.Share 
* they do calls against core/ajax/share.php which doesn't exist anymore
* also the methods are not called in any of our apps or any of the apps in the appstore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:29:00 -03:00
Morris Jobke
d222351c87
Fix variable definitions in oc dialogs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:09:29 -03:00
Morris Jobke
26b92ada0e
Remove unused JS file 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:59:10 -03:00
Morris Jobke
a9ccfe06d9
Fix some long lines in JS - JSLinut recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:49:00 -03:00
Morris Jobke
80a5e0a735
Use dot notation for array access - JSLint recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:45:41 -03:00
Morris Jobke
11b9d224fd
Fix semicolon at end of JS lines 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:42:53 -03:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Morris Jobke
55da62a29c
Make tooltip intransparent 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 10:44:38 -03:00
Morris Jobke
9af26d1db5 Merge pull request #4597 from nextcloud/tooltips-invert 
Invert tooltip color to white, fix #4563
 2017-04-29 10:43:33 -03:00
Jan-Christoph Borchardt
bc36446455 Define max-width for Contacts menu for mobile 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-29 13:55:57 +02:00
Jan-Christoph Borchardt
7015eb9fe5 Prevent flashing of apps and user menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-29 13:34:44 +02:00
Jan-Christoph Borchardt
41b67e3d17 Invert tooltip color to white, fix #4563 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-29 13:19:17 +02:00
Morris Jobke
d91b4044fc
optimize SVGs 2017-04-29 00:54:30 -03:00
Thomas Pulzer
637c75bca1
Implemented visual feedback if a user is disabled in admin user menu. 
Implemented visuals for enabling/disabling user from admin user list.
Added the controller functions for enabling/disabling a user.

Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller.
 Finished the visuals to reflect current user status and changed user status respectively.

Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable.

Added displaying of disabled user count.
Improved style of user action menu.

Added proper counting of disabled users.
Removed visual indicator for disabled users.

Moved pseudo-group detection for disabled users from frontend to the controller.
Changed units for newly introduced css values from em to px.
Removed unnecessary png and optimized svg with scour.
Changed the userlist template to display the user action menu with correct width.

Style fixes for better readability and coding style conformity.

Changed the icons for enabling, disabling and deleting a user in the action menu.
 2017-04-29 00:54:30 -03:00
Jan-Christoph Borchardt
2a07ec8e21
Add verification icons 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-28 23:41:36 -03:00
Nextcloud bot
c4673224d1
[tx-robot] updated from transifex 2017-04-29 00:07:17 +00:00
Julius Härtl
d13e311aaf
Invert new header icons on bright theming colors 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-28 15:53:33 -03:00
Nextcloud bot
3c4dab1bbe
[tx-robot] updated from transifex 2017-04-28 14:05:56 +00:00
Roeland Jago Douma
3e8c5441f7 Merge pull request #4521 from nextcloud/custom-mount-types 
allow apps to set custom mount types
 2017-04-28 12:50:38 +02:00
Lukas Reschke
ec272f3ac3 Merge pull request #4574 from nextcloud/rename-extension-point 
Rename extension point
 2017-04-28 11:15:28 +02:00
Lukas Reschke
9e7f7ba7f6
Add sharing types for guests 
Fixes https://github.com/nextcloud/guests/issues/4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-28 09:56:57 +02:00
Lukas Reschke
e974f26afa
Rename extension point 
To align with upstream.

Fixes https://github.com/nextcloud/guests/issues/3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-28 09:49:02 +02:00
Joas Schilling
3fb7de2dfb Merge pull request #4562 from nextcloud/contactmenu-second-tooltip 
Show tooltip for second action in contacts menu
 2017-04-28 09:38:35 +02:00
Robin Appelman
ab9a36e872
allow apps to set custom mount types 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-28 09:38:21 +02:00
Thomas Müller
43427e26d7
Add console command to migrate the charset 2017-04-28 09:35:36 +02:00
Lukas Reschke
a809aa51cd Merge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade 
Do not disable 3rdparty apps on occ upgrade
 2017-04-28 08:33:28 +02:00
Nextcloud bot
6908818999
[tx-robot] updated from transifex 2017-04-28 00:07:41 +00:00
Morris Jobke
aa10cca61b
Do not disable 3rdparty apps on occ upgrade 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-27 18:11:33 -03:00
Ivan Sein
9c4275a832 Show tooltip for second action. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2017-04-27 18:11:35 +02:00
Nextcloud bot
c1c5f51fd8
[tx-robot] updated from transifex 2017-04-27 00:07:40 +00:00
Morris Jobke
313c971bd5 Merge pull request #4529 from nextcloud/fix-filelist-checkboxes 
Fix filelist and checkbox vertical align
 2017-04-26 16:52:46 -03:00
Roeland Jago Douma
646db7f88d Merge pull request #4518 from nextcloud/downstream-25838 
Fix share indicator handling
 2017-04-26 19:23:27 +02:00
Jan-Christoph Borchardt
d17258d4b9 Fix filelist and checkbox vertical align 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-26 16:47:04 +02:00
Vincent Petry
17a31a51c6
Fix share indicator handling 
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
 2017-04-26 13:38:12 +02:00
Georg Ehrke
6bbc682c4b
handle 404 separately 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:30:21 +02:00
Georg Ehrke
99b201a188
unit test jquery.contactsmenu 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:15 +02:00
Georg Ehrke
e61cf83faf
better detection whether or not contactsmenu target was clicked 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:14 +02:00
Georg Ehrke
399f08bd33
add contactsmenu popover to resharer infobox 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:14 +02:00
Georg Ehrke
4d60aff6ec
Contactsmenu popover: show proper message when server throws error 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:14 +02:00
Georg Ehrke
8f404c1f56
don't toggle sharing popover together with contactsmenu popover 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:14 +02:00
Georg Ehrke
c844b2931e
close menu again when clicking on avatar 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:26:56 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:26:53 +02:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
241e397326 Merge branch 'master' into contactsmenu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-26 00:50:38 +02:00
Jan-Christoph Borchardt
0f0b04b7d9 Fix test 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-26 00:06:56 +02:00
Morris Jobke
417bc606e4 Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging 
Remove js debug logging
 2017-04-25 18:26:53 -03:00
Christoph Wurst
fd74ad452a Remove js debug logging 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 21:42:38 +02:00
Jan-Christoph Borchardt
2ccaae8968 Fix emptycontent HTML and wording 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 20:47:18 +02:00
Jan-Christoph Borchardt
4ae5340814 Fix spinner position of Contacts menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 20:47:18 +02:00
Christoph Wurst
945420baaf Use HTTP POST to retrieve the list of contacts 
We do not want to have sensitive information in the URL and
therefore also not in the access log. Thus the GET request is
replaced by a POST request.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:18 +02:00
Christoph Wurst
5c61852c25 Fix failing contacts menu js test data 
When we test wheter action menus in the contacts menu close
when clicking other ones, we have to provide test data
that actually causes the view to render the menu.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:18 +02:00
Christoph Wurst
ecd408d524 Fix icon of second action 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Christoph Wurst
2c2e1f7988 Use absolute URI for action icons 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Christoph Wurst
36cee1f386 Let apps register contact menu provider via info.xml 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Christoph Wurst
5762cd9436 Use tooltop for contact's top action title 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00