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

30074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
453ea6698d [Share 2.0] Fix public link sharing 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
c1841892d0 [Share 2.0] Fix OCS endpoint 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
96662c4d0d [Share 2.0] Fix shareManager 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
eb904c7aa9 [Share 2.0] Fix defaultshare provider 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
78be766cf5 [Share 2.0] Use strings for ids 
* sharedWith
* sharedBy
* shareOwner

Now all set/get strings with the id. (userId, groupId,
federatedsharerId).

This to avoid a huge amount of if statements
 2016-02-03 19:25:29 +01:00
Daniel Molkentin
c0322b3f98 Merge pull request #22106 from owncloud/use-newly-generated-keys 
Use newly generated certificate authority
 2016-02-03 18:19:24 +01:00
Lukas Reschke
1d27a53338 Use newly generated certificate authority 2016-02-03 18:17:43 +01:00
Thomas Müller
dfeb6ea491 Merge pull request #22086 from RealRancor/RealRancor-patch-1 
Remove files_locking from shipped.json
 2016-02-03 16:09:02 +01:00
Thomas Müller
e34ec0a138 Merge pull request #22095 from owncloud/public_link_with_port 
Public link downloads should work on instance on non default port
 2016-02-03 16:06:54 +01:00
Thomas Müller
ab1c79827e Merge pull request #22071 from owncloud/cache-split-insert 
split cache->insert from cache->put
 2016-02-03 14:32:28 +01:00
Thomas Müller
74abbbc0d6 Merge pull request #22098 from owncloud/cleanup-core-apps 
Cleanup core apps
 2016-02-03 14:17:10 +01:00
Thomas Müller
f2ada30888 Merge pull request #21996 from owncloud/flysystem-1.0.16 
[3rdparty] Bump flysystem to 1.0.16
 2016-02-03 13:57:09 +01:00
Thomas Müller
aaf7299d28 Merge pull request #22070 from owncloud/share2_exceptions 
Add sharing exceptions to OCP
 2016-02-03 13:36:14 +01:00
Thomas Müller
cf81574e87 Merge pull request #22099 from owncloud/revert-22090-skip-migration-tests-setting 
Revert "setting to skip migration tests by default"
 2016-02-03 13:03:43 +01:00
Morris Jobke
0a66734416 Revert "setting to skip migration tests by default" 2016-02-03 12:59:47 +01:00
Joas Schilling
599eb141b4 Make sure tests don't leave a stray directory behind 2016-02-03 12:57:22 +01:00
Joas Schilling
78d5c89e86 Make sure encryption has a valid licence tag 2016-02-03 12:57:03 +01:00
Joas Schilling
d79b0886d0 Remove deprecated and unused standalone tag 2016-02-03 12:56:42 +01:00
Joas Schilling
13c8fd4558 Remove invalid app user doc links 2016-02-03 12:56:17 +01:00
Robin Appelman
f2bba59b79 split cache->insert from cache->put 2016-02-03 12:55:36 +01:00
Thomas Müller
621f54da51 Merge pull request #21997 from owncloud/checksums 
Checksums
 2016-02-03 11:36:22 +01:00
Thomas Müller
459a12c8b3 Merge pull request #22081 from owncloud/mount-cache-invalid-storage 
filter invalid storages from the mount cache early
 2016-02-03 11:36:04 +01:00
Thomas Müller
85174d8526 Merge pull request #22084 from owncloud/configphp-fixes 
small corrections; Web is capitalized, webroot is one lowercase word
 2016-02-03 11:35:43 +01:00
Thomas Müller
a66a575859 Merge pull request #22090 from owncloud/skip-migration-tests-setting 
setting to skip migration tests by default
 2016-02-03 11:35:16 +01:00
Roeland Jago Douma
4bb96a5553 Construct valid URL 2016-02-03 11:29:36 +01:00
Roeland Jago Douma
aef43816c2 host and hostname are different things 
host can contain the port (host of http://example.com:1234 is
example.com:1234) while hostname never contains a port. They can however
be similar. If you navigate to http://example.com then both host and
hostname will be example.com.

* Fixed docs
* added getHostName function
 2016-02-03 11:28:07 +01:00
Carla Schroder
7d49bb6323 small corrections; Web is capitalized, webroot is one lowercase word 2016-02-03 10:06:44 +01:00
RealRancor
9bbb7b1c3e Remove files_locking from shipped.json 2016-02-03 09:42:01 +01:00
Morris Jobke
2e444e6e37 setting to skip migration tests by default 
* if you install owncloud via package it is not
  possible to skip migration tests
* this also allows to disable migration tests for
  an instance by default
 2016-02-03 09:08:27 +01:00
Thomas Müller
d66a836251 Merge pull request #21772 from owncloud/occ-external-applicable 
Add occ command to manage applicables
 2016-02-03 09:03:59 +01:00
Roeland Jago Douma
2035a179bc Add store/retrieve checksums 
* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums
 2016-02-03 09:03:51 +01:00
Thomas Müller
d4b356e0e9 Merge pull request #21961 from owncloud/comments-gui 
Comments GUI in files sidebar
 2016-02-03 09:03:43 +01:00
Thomas Müller
77942ad38a Merge pull request #22059 from owncloud/comments-readmark-dav 
Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status
 2016-02-03 09:00:32 +01:00
Thomas Müller
1531e7f440 Merge pull request #22053 from owncloud/files_external-params-flags 
Remove magic flags from files_external backend params
 2016-02-03 09:00:17 +01:00
Jenkins for ownCloud
92a1d1c0e3 [tx-robot] updated from transifex 2016-02-03 01:55:26 -05:00
Morris Jobke
d7892619b1 Merge pull request #22076 from owncloud/activities-yes-default-enabled-no 
Don't enable tag activities for email by default
 2016-02-02 18:20:20 +01:00
Vincent Petry
5e08f1df78 Add comments app to expected apps in test 2016-02-02 18:16:54 +01:00
Robin Appelman
8a30058f52 filter invalid storages from the mount cache early 2016-02-02 18:10:13 +01:00
Vincent Petry
8b98cf5a5b Fixed report name 2016-02-02 18:06:16 +01:00
Vincent Petry
03f4b49ecc Added JS unit tests for comments 2016-02-02 18:01:15 +01:00
Vincent Petry
9028457ea2 Add spinner when submitting comments 2016-02-02 18:01:15 +01:00
Vincent Petry
d81c00304f Fix parsing empty Webdav property nodes 
Return empty string instead of undefined
 2016-02-02 18:01:15 +01:00
Vincent Petry
3a6d065e50 Fix formatting messages with newlines 2016-02-02 18:01:15 +01:00
Vincent Petry
64ad99db70 Better comments pagination logic 2016-02-02 18:01:15 +01:00
Vincent Petry
fdf555e814 Improve comments style, add avatars 2016-02-02 18:01:15 +01:00
Vincent Petry
3b581b051f Expose display name in JS side 
Adds a new method `OC.getCurrentUser` to get both the user id and
display name Could be used for a future Js
 2016-02-02 18:01:15 +01:00
Vincent Petry
67a36a2cca Use last comment's time for pagination 2016-02-02 18:01:15 +01:00
Vincent Petry
29386eccf9 Add pagination support for comments GUI 2016-02-02 18:01:15 +01:00
Vincent Petry
d1518045ec Improve comment date format 2016-02-02 18:01:15 +01:00
Vincent Petry
cca33942aa Comments GUI 2016-02-02 18:01:15 +01:00