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

34681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
19f94ac5f9 Merge pull request #1549 from nextcloud/kill-update-simulation 
Kill update simulation
 2016-09-28 16:29:09 +02:00
Lukas Reschke
32640c9a5b Merge pull request #1554 from nextcloud/updatestate-can-be-empty 
UpdateState is empty if no update is available
 2016-09-28 13:03:28 +02:00
Lukas Reschke
1602e82363
UpdateState is empty if no update is available 
This leads to log messages such as "Undefined index: updaterEnabled at /media/psf/nextcloud/apps/updatenotification/lib/Controller/AdminController.php#116".

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-28 12:37:08 +02:00
Julius Härtl
f219ed2e99 Merge pull request #1535 from nextcloud/files-loading-css-fix 
Use css loading animation and not gif
 2016-09-28 10:38:46 +02:00
Nextcloud bot
e2670e62eb
[tx-robot] updated from transifex 2016-09-28 00:10:20 +00:00
John Molakvoæ
f623d020f7 Use css loading animation and not gif 
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
 2016-09-27 21:06:25 +02:00
Lukas Reschke
c4d263199c Merge pull request #1521 from nextcloud/fix-mimetypedetect-hiddenfolder 
Fix mimetype detection inside hidden folders (#26138)
 2016-09-27 18:52:48 +02:00
Lukas Reschke
2f488ce373 Merge pull request #1459 from nextcloud/upstream-fix_trashbin_deleteallhooks_solution2 
[Upstream] fix trashbin deleteallhooks solution2
 2016-09-27 18:52:14 +02:00
Lukas Reschke
06e969cb74 Merge pull request #1197 from nextcloud/oc-public-sharing 
CalDAV calendar public sharing
 2016-09-27 18:51:40 +02:00
Lukas Reschke
3b7f548b0f
Remove unused and undefined use statement 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-27 18:45:05 +02:00
Vincent Petry
da0cea404d
Kill update simulation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-27 18:43:53 +02:00
Björn Schießle
6ca8ce6228 Merge pull request #1543 from nextcloud/increase-component-length 
Increase the max length for components
 2016-09-27 18:01:45 +02:00
Joas Schilling
a7315e98ff
Increase the max length for components 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 17:03:57 +02:00
Lukas Reschke
a4b2b9058e Merge pull request #1540 from nextcloud/switch-for-autoupdater-control 
Switch for autoupdater control
 2016-09-27 16:06:38 +02:00
Joas Schilling
615b69677e
Use the same URL everywhere 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 14:52:22 +02:00
Joas Schilling
3e00554d35
Respect updater kill switch and fall back to download button 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 14:47:59 +02:00
Joas Schilling
6f955defe4
Return the autoupdater value from the server 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 14:38:10 +02:00
Lukas Reschke
3e843fcd82 Merge pull request #1538 from nextcloud/fix-integration-test-to-use-a-valid-url 
Fix integration test to use a valid URL
 2016-09-27 12:35:55 +02:00
Joas Schilling
eb8886851f
Fix integration test to use a valid URL 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 12:00:02 +02:00
Morris Jobke
6a3e0f33b3 Merge pull request #1489 from nextcloud/fix-status-code-when-app-is-disabled 
Return 404 on v2.php when the app is disabled
 2016-09-27 11:04:57 +02:00
Nextcloud bot
810f72df46
[tx-robot] updated from transifex 2016-09-27 00:09:46 +00:00
Morris Jobke
71fc9303c3 Merge pull request #1516 from nextcloud/fix-openbasedir-realpath-warning 
Only use realpath for real directories (#26058)
 2016-09-27 00:10:23 +02:00
Lukas Reschke
a43c680d9f Merge pull request #1499 from nextcloud/updater 
Add repair step and revert "Open updater" button
 2016-09-26 22:28:21 +02:00
Lukas Reschke
56437ad881 Merge pull request #1530 from nextcloud/make-repo-configurable 
Read repo name dynamically
 2016-09-26 21:21:17 +02:00
Lukas Reschke
6a490106bc
Read repo name dynamically 
This way apps can easily use this as well

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 21:20:01 +02:00
Morris Jobke
6b2920a6bc Merge pull request #1520 from nextcloud/upload-allow-zero 
Allow uploading empty files (#26113)
 2016-09-26 17:40:53 +02:00
Morris Jobke
3e4a4cab34 Merge pull request #1510 from nextcloud/workflow-fix-handlebar-update 
Fix selection of workflowengine rules and operators
 2016-09-26 17:33:22 +02:00
Lukas Reschke
598b243838 Merge pull request #1426 from nextcloud/sanitze_opt 
Optimize sanitizeName
 2016-09-26 14:10:50 +02:00
Joas Schilling
fc65093694 Merge pull request #1460 from nextcloud/fed-share-retry 
[upstream] Fix fed share test call to return proper result
 2016-09-26 13:59:28 +02:00
Morris Jobke
afe40ac996
write channel to config file when changed 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-09-26 13:44:56 +02:00
Morris Jobke
6f72341c0b
dump autoload path for new class 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-09-26 13:44:56 +02:00
Morris Jobke
4064010c29
Revert "Fix tests" 
This reverts commit 27a3c68d84.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-09-26 13:44:50 +02:00
Lukas Reschke
4f4286932f Merge pull request #1457 from nextcloud/upstream-fix-birthday-calendar-component 
[Upstream] fix birthday calendar component
 2016-09-26 13:21:08 +02:00
Lukas Reschke
fa44c355d5 Merge pull request #1471 from pmattern/readme-dev-version 
README.md: Add notes how to run master checkouts
 2016-09-26 13:19:00 +02:00
Lukas Reschke
0873fe4284 Merge pull request #1524 from nextcloud/addScript 
use correct case for addScript (#26214)
 2016-09-26 13:18:41 +02:00
Lukas Reschke
982ffa9092 Merge pull request #1523 from nextcloud/change_min_log_level 
Change the minimum log level to fatal
 2016-09-26 13:16:40 +02:00
Lukas Reschke
0c6957dfb7 Merge pull request #1406 from nextcloud/fix-folder-drop-in-firefox 
Fix folder drag glitch in Firefox
 2016-09-26 13:10:19 +02:00
Thomas Citharel
dcc23114e9
fix annotations & copyright headers 2016-09-26 11:55:43 +02:00
Thomas Citharel
9c75b00850
fix tests 2016-09-26 11:55:43 +02:00
Thomas Citharel
17d5dfdeb1
add in same request 2016-09-26 11:55:43 +02:00
Thomas Citharel
8360222554
fix public calendars 2016-09-26 11:55:42 +02:00
Thomas Müller
d884370844
Use true random string as uri for public calendars - as a result we can no longer return the pre-publish-url 2016-09-26 11:55:42 +02:00
Lukas Reschke
4659e3ab59
Add new constructor args 2016-09-26 11:55:42 +02:00
Lukas Reschke
2fff203c59
Add missing constructor argument 2016-09-26 11:55:42 +02:00
Thomas Citharel
ff67cbc6af
Add test for PublicCalendarRoot 2016-09-26 11:55:42 +02:00
Thomas Citharel
3e9a346223
add calendarserver-sharing to the list of advertised features 2016-09-26 11:55:41 +02:00
Thomas Citharel
ad0eeaaf1c
use AllowedSharingModes for can-be-published & can-be-shared 2016-09-26 11:55:41 +02:00
Thomas Citharel
6378dbca7e
fix can-be-published 2016-09-26 11:55:41 +02:00
Thomas Citharel
f0421e1f75
add missing tests 2016-09-26 11:55:41 +02:00
Thomas Citharel
f16ea48e96
add can-be-published property 2016-09-26 11:55:40 +02:00