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

48050 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
ba03c1a84c
Merge pull request #13548 from nextcloud/feature/10964/app_tokens_activity 
Publish event for app token create/update/delete
 2019-02-01 14:56:45 +01:00
Joas Schilling
e780303ee7
Make strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-01 13:18:52 +01:00
Joas Schilling
09642da8cc
Use rich object subjects 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-01 13:15:59 +01:00
Roeland Jago Douma
b249c16506
Merge pull request #13796 from nextcloud/design/settings-caldav 
Move calendar settings into basic settings
 2019-02-01 13:00:44 +01:00
Morris Jobke
6d35597999
Merge pull request #13970 from nextcloud/fix/do_not_try_to_load_removed_files 
Do not try to load js moved to bundle
 2019-02-01 12:16:59 +01:00
Roeland Jago Douma
af62b963c7
Merge pull request #13972 from nextcloud/backport/13947/master 
[master] trim filename in webfrontend for windows compatibility
 2019-02-01 12:09:54 +01:00
Roeland Jago Douma
23245904d3
Merge pull request #13694 from b108/duplicate-functionality-in-request-class 
Remove duplicate functionality
 2019-02-01 11:28:25 +01:00
Christian Aigner
ce37930910 HBOX-297 trim in webfrontend for new files to stay compatible with windows 2019-02-01 09:47:07 +00:00
Roeland Jago Douma
f1b0332920
Do not try to load js moved to bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-01 10:39:47 +01:00
Morris Jobke
5fe151f7c4
Merge pull request #13927 from nextcloud/remove-dead-code 
Don't call apc_delete_file and apc_clear_cache anymore
 2019-02-01 10:17:55 +01:00
Morris Jobke
0d22ea71d8
Merge pull request #12090 from nextcloud/aastha/11923 
Add title attribute for app navigation items.
 2019-02-01 10:14:42 +01:00
Georg Ehrke
ea1f6f6aef
make text in Groupware Settings translateable 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-02-01 10:06:32 +01:00
Georg Ehrke
6c49dd169b
fix link to Calendar app in Groupware page 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-02-01 10:06:32 +01:00
Georg Ehrke
9cea139634
Turn "email server" in groupware settings to link to mail settings 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt
3508c2368f
Keep Calendar server settings in groupware but link mail server settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt
280dce8dbc
Calendar server: Link Calendar app and calendar sync docs 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt
c44c23a1c3
Improve design of description below label of checkbox or radio button 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:31 +01:00
Jan-Christoph Borchardt
b068809d9f
Move calendar settings into basic settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-02-01 10:06:28 +01:00
Morris Jobke
e7fafa6b15
Merge pull request #13960 from nextcloud/refactor/global-helpers-bundle 
Move global helper functions to the bundle and deprecate some of them
 2019-02-01 09:32:10 +01:00
Morris Jobke
30fb78c878
Merge pull request #12917 from nextcloud/feature/noid/favorites-quickaccess-add-droppable-v3 
Added Drozone to favorites quickaccess
 2019-02-01 09:30:42 +01:00
Christoph Wurst
ab73c9c328
Move global helper functions to the bundle and deprecate some of them 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 09:15:30 +01:00
Morris Jobke
8709f6b218
Merge pull request #13957 from nextcloud/refactor/oc-search-passwordconfirm-util 
Move OC.Search, OC.PasswordConfirmation and OC.Util to the server bundle
 2019-02-01 09:09:41 +01:00
Morris Jobke
4a3fe2655f
Merge pull request #13261 from nextcloud/fix/12395 
only show "Add to your Nextcloud" on share link if federation is acti…
 2019-02-01 09:09:02 +01:00
Christoph Wurst
799a0fbb78
Make chunkify an internal function to prevent context errors 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:51:46 +01:00
Roeland Jago Douma
f77c3fcf89
Merge pull request #13932 from filisko/master 
Comment fix.
 2019-02-01 08:46:48 +01:00
Christoph Wurst
0d43ef06f5
Add OC.Util to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:25:01 +01:00
Christoph Wurst
9de02d3267
Move OC.PasswordConfirmation to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:24:13 +01:00
Christoph Wurst
dbfa8b65a1
Move OC.search to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 08:22:49 +01:00
Roeland Jago Douma
dc3b44c02d
Merge pull request #13956 from nextcloud/refactor/oc-plugins-msg-notifications-II 
Move OC.Plugins, OC.msg and OC.Notification to the server bundle
 2019-02-01 08:20:03 +01:00
Christoph Wurst
3d1a3b6644
Move OC.Plugin to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 07:58:07 +01:00
Christoph Wurst
4846aea951
Move OC.msg to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 07:56:38 +01:00
Christoph Wurst
4fcadd27b0
Move OC.Notification to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-01 07:55:16 +01:00
fnuesse
f13b3ab4ae Add drop zone for favorites quick access in navigation 
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
 2019-02-01 01:45:03 +01:00
fnuesse
4b32e1c6ab Extract variable for yellow color in icons 
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
 2019-02-01 00:59:05 +01:00
fnuesse
ad407f64bd Fix drop zone shadow 
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
 2019-02-01 00:59:05 +01:00
Daniel Calviño Sánchez
8680ced1ae Unify handling of dropping one file or several files on the trash bin 
When a single file was dropped on the trash bin the file information was
gotten from the original element in the file list. When several files
were dropped on the trash bin the file information was gotten from the
helper elements being dragged around. The helper element also contain
the needed file information when a single file is being dragged, so the
handling was unified to always get the file information from the helper
elements.

As the handling of several files is the same as before there is still
the issue of only deleting those files shown in the drag helper instead
of all the selected files.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-02-01 00:56:50 +01:00
Morris Jobke
2124ff65b6
Merge pull request #13958 from nextcloud/refactor/custom-polyfills-bundle 
Move custom polyfills to the server bundle
 2019-01-31 23:03:23 +01:00
Jonas Sulzer
3a5d634ccc
add myself as @author 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:01 +01:00
Jonas Sulzer
e2ec22c43d
code styling 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:00 +01:00
Jonas Sulzer
5756d96ab9
restructure code 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:00 +01:00
Jonas Sulzer
30d4024d9d
only show "Add to your Nextcloud" on share link if federation is activated 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:38:31 +01:00
Roeland Jago Douma
c07a16e9f7
Generate assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-31 21:37:11 +01:00
Aastha Gupta
4658d69e64
Add title attribute for app navigation items. 
Fix: #11923
 2019-01-31 21:33:32 +01:00
Roeland Jago Douma
f2ab8dd59c
Merge pull request #13945 from nextcloud/show-autocompletion-as-soon-as-at-is-typed 
Show autocompletion as soon as "@" is typed
 2019-01-31 20:16:45 +01:00
Daniel Calviño Sánchez
e46a67ef4c Use full names instead of abbreviations in variable names 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-31 19:55:51 +01:00
Daniel Calviño Sánchez
3baa078f70 Make code format more consistent with the rest of the file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-31 19:55:51 +01:00
Daniel Calviño Sánchez
75edcad549 Replace double quotes with single quotes 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-31 19:55:51 +01:00
Daniel Calviño Sánchez
96bc1397b1 Add missing trailing ";" 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-31 19:55:33 +01:00
Daniel Calviño Sánchez
72a424d4c8 Remove unneeded triggering of event 
The "droppedOnTrash" event was being triggered when the file list was
initialized, but it should be triggered only when the user actually
drops a file on the trash bin.

Besides that, the event had no effect; only the file list handles it,
but as it was not triggered on any element it ended being triggered on
the document, and thus not handled. Moreover, even if it had been
triggered on the file list it would have been done before the handler
was set, so it would not have been handled anyway. And even if it had
been handled no data was provided, so the handler would have failed.

In conclusion, triggering the event there was not needed, and thus it
was removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-31 19:14:58 +01:00
Christoph Wurst
bdea197523
Move custom polyfills to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-31 19:07:39 +01:00