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

41191 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
5987099d2a
Remove unneeded check if app is enabled 
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:47:06 +02:00
Morris Jobke
f884e762bc
Use appmanager instead of OC_App for check for enabled app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:31:17 +02:00
Julius Härtl
b3c025fd08
Revert copyright changes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Julius Härtl
4cfa1c66b8
Doc: Fix phpDoc issues 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Joas Schilling
8062547e66 Merge pull request #6915 from nextcloud/css-border-radius 
Border-radius does not need the vendor prefixes anymore
 2017-10-23 21:47:20 +02:00
John Molakvoæ
59598b8a27 Merge pull request #6916 from nextcloud/css-box-sizing 
Box-sizing does not need vendor prefix anymore
 2017-10-23 21:13:17 +02:00
John Molakvoæ
c68a44d5f0 Merge pull request #6917 from nextcloud/css-box-shadow 
Box-shadow does not need vendor prefix anymore
 2017-10-23 21:12:29 +02:00
Morris Jobke
28016a2a70
Box-shadow does not need vendor prefix anymore 
https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
http://caniuse.com/#search=box-shadow

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 20:14:31 +02:00
Morris Jobke
c2004afb4f
Box-sizing does not need vendor prefix anymore 
http://caniuse.com/#search=box-sizing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 20:10:39 +02:00
Morris Jobke
b29fa32939
Border-radius does not need the vendor prefixes anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 20:04:36 +02:00
Morris Jobke
2f8c7f0de2 Merge pull request #6780 from nextcloud/rakekniven-patch-1 
Update file-upload.js
 2017-10-23 09:15:57 -07:00
Arthur Schiwon
fb40afc4d4
enable autocomplete when editing comments 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-23 18:00:39 +02:00
John Molakvoæ
e5b619d0a6 Merge pull request #6848 from nextcloud/user-app-nav-to-css-guidelines 
User settings app-navigation to css guidelines
 2017-10-23 17:51:03 +02:00
Lukas Reschke
14a37d3512 Merge pull request #6892 from nextcloud/rakekniven-patch-2 
Update settings-admin-caldav.php
 2017-10-23 16:17:18 +02:00
Arthur Schiwon
eb8f1247fe
fix unstable comment order 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-23 15:37:36 +02:00
Lukas Reschke
886bb31ec3 Merge pull request #6913 from nextcloud/tests-for-6837 
Provide tests for future timestamp formatting
 2017-10-23 14:46:10 +02:00
Morris Jobke
ca4278a4d7
Provide tests for future timestamp formatting 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 14:20:21 +02:00
Joas Schilling
143ff6a622
Add a doc why this should not be removed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-23 12:35:55 +02:00
Nextcloud bot
db1096bcfd
[tx-robot] updated from transifex 2017-10-23 00:08:39 +00:00
Georg Ehrke
1855204ad9
remove reminders from read-only shared calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-10-22 14:19:29 +02:00
Arthur Schiwon
de8a475b0b
fix contactsmenu-popup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:34 +02:00
Arthur Schiwon
ccbcce978f
convert mentions after save to the plain format we use 
also ensures proper rendering, even of edited comments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:34 +02:00
Arthur Schiwon
8d9f485b35
when writing a comment, render mentions as they'd appear anywhere 
i.e. avatar with displaymenu and contactsmenu-popover

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:33 +02:00
Arthur Schiwon
ec5607544c
turn textarea to contenteditable div 
we will need it for nice formatting of the mentioned user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:33 +02:00
Arthur Schiwon
df0e72d8d9
contenteditable divs should look like textareas 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:33 +02:00
Arthur Schiwon
d1afbedc5f
setup atwho autocomplete 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:33 +02:00
Arthur Schiwon
8e60a2bd28
add At.js and dependencies 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:14:33 +02:00
Arthur Schiwon
04fafdd505
fix class name in info.xml 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
8722458d2a
ensure that sorting is stable 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
8f0a9ae51f
split walking the tree from operating on it 
so walking it is reusable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
fd6daf8d19
AutoCompletion backend 
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:32 +02:00
blizzz
cd80e5dc7c Merge pull request #6758 from nextcloud/allow-0-quota-again 
Allow quota of 0 again
 2017-10-22 14:10:55 +02:00
Nextcloud bot
2b31b82891
[tx-robot] updated from transifex 2017-10-22 00:08:36 +00:00
John Molakvoæ (skjnldsv)
2e38d0173d
Fix deletion feedback 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv)
f3d9961150
Fix editing form visibility 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv)
69f0f17f32
Edit form to guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv)
f4004d3ab8
User settings app-navigation to css guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:45 +02:00
rakekniven
2c93b297f0 Update settings-admin-caldav.php 2017-10-21 14:05:20 +02:00
Nextcloud bot
3709d3eeae
[tx-robot] updated from transifex 2017-10-21 00:08:26 +00:00
Nextcloud bot
a94976bfc8
[tx-robot] updated from transifex 2017-10-20 00:08:34 +00:00
Lukas Reschke
9932b7498d Merge pull request #6873 from nextcloud/ldap_proxy_redix_fix 
Ldap proxy Redis fix
 2017-10-19 12:03:04 +02:00
Joas Schilling
bb1af9b284 Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitations 
Opt out of IMip CalDAV Plugin
 2017-10-19 11:57:52 +02:00
Lukas Reschke
7de6f7cd07 Merge pull request #6677 from nextcloud/downstream-dont-reset-quota 
don't reset quota
 2017-10-19 11:42:37 +02:00
Joas Schilling
6efa0b86d0
Allow quota of 0 again 
Regression from f1fccaca06

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:37:29 +02:00
Lukas Reschke
3f352d5f3b Merge pull request #6825 from nextcloud/no-filecache-update 
No automatic filecache update
 2017-10-19 11:30:56 +02:00
Joas Schilling
65e938c4fd
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:18:21 +02:00
Lukas Reschke
3a3e6c34d0 Merge pull request #6835 from nextcloud/dav-plugins-from-apps-only 
Let apps register Sabre plugins or collections (v2)
 2017-10-19 11:09:12 +02:00
Joas Schilling
dcb322a6b3
Extend the API with teh parameters from Swift 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:05:47 +02:00
Roeland Jago Douma
4388ec2231
Little bit of code cleanup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-19 11:05:24 +02:00
Lukas Reschke
f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader 
Allow apps to have their own autoloader
 2017-10-19 11:05:23 +02:00