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

30210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
c1ae8b0d81 Adding common name to sharee 2016-02-08 11:36:57 +01:00
Thomas Müller
5b86148d3a Original resources should not be overwritten by shared resources 2016-02-08 11:36:57 +01:00
Thomas Müller
9eef38c593 Merge pull request #22190 from owncloud/fix_22189 
Even single shares are returned as array
 2016-02-08 10:47:55 +01:00
Roeland Jago Douma
ca32778975 Even single shares are returned as array 
When fetching a single share using ../shares/<ID> we should still return
an array of shares.

Fixes #22189
 2016-02-08 10:11:22 +01:00
Thomas Müller
03ca63c224 Merge pull request #22138 from owncloud/comments-collapse 
Collapse long comments
 2016-02-08 10:11:02 +01:00
Vincent Petry
78864dc6fa Collapse long comments 
Very crude a naive implementation that relies on length and number of
newlines. Should be good enough for most cases.

Clicking on such comments will expand them.
 2016-02-08 10:05:03 +01:00
Thomas Müller
62b5948ff5 Merge pull request #22156 from owncloud/share2_unshare_ifexpired 
Delete a link share if it is expired on access
 2016-02-08 09:59:00 +01:00
Thomas Müller
83b4e2c8d1 Merge pull request #22160 from owncloud/files_external-create 
Add occ files_external:create command to add new mounts
 2016-02-08 09:58:43 +01:00
Thomas Müller
64ad927f24 Merge pull request #22161 from owncloud/dav-ie9 
Make JS Webdav work again with IE9-IE10
 2016-02-08 09:58:27 +01:00
Jenkins for ownCloud
4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Roeland Jago Douma
46faf6d3ca Fix exception on delete 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
8486d61764 getSharesBy should also expire link shares 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
3028ec5440 Delete expired share when fetched by id 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
5ed56d9edb Delete a link share if it is expired on access 
If we access a link share we should check if it has expired already.
If so we should remove it and throw a ShareNotFound exception
 2016-02-06 13:31:54 +01:00
Thomas Müller
69a4cd2898 Merge pull request #22102 from owncloud/ldap_2nddispname-master 
[LDAP] add second field for additional/optional display name attribute
 2016-02-06 13:27:01 +01:00
Thomas Müller
5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup 
cleanup jobs for comments and comment read marks
 2016-02-06 13:26:00 +01:00
Thomas Müller
7297408150 Merge pull request #22163 from owncloud/comments-sizelimit 
Limit comment size to 1000 in UI
 2016-02-06 13:25:38 +01:00
Thomas Müller
7141c70cd0 Merge pull request #20618 from owncloud/action-icon-size 
Fix image sizing for action icons in Edge
 2016-02-06 13:25:10 +01:00
Thomas Müller
079ebe2be6 Merge pull request #22165 from owncloud/comments-markowncommentasread 
Mark own comments as read after posting
 2016-02-06 13:22:20 +01:00
Thomas Müller
a9015d61a7 Merge pull request #22166 from owncloud/remove-local-folder 
remove unused Storage->getLocalFolder
 2016-02-06 13:21:59 +01:00
Jenkins for ownCloud
9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Joas Schilling
065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Thomas Müller
6ccd5ecb07 Merge pull request #22169 from owncloud/cache-interface-fixes 
Cache interface cleanup/phpdoc
 2016-02-05 18:09:19 +01:00
Robin Appelman
282c1cb24f remove unused Storage->search 2016-02-05 17:52:37 +01:00
Robin Appelman
559189cf47 additional phpdoc for search 2016-02-05 17:52:19 +01:00
Thomas Müller
f8dfc6201b Merge pull request #22155 from owncloud/use-svg-for-desktopapp 
Use SVG for desktop app button
 2016-02-05 17:46:45 +01:00
Robin Appelman
615f0f5499 add deprecation notice to search methods 2016-02-05 17:46:43 +01:00
Robin Appelman
fb76d7de69 remove unused Storage->getLocalFolder 2016-02-05 16:48:08 +01:00
Thomas Müller
7568c40275 Merge pull request #22159 from owncloud/fix_21678 
Gracefull handle link shares rename hook
 2016-02-05 16:36:04 +01:00
Vincent Petry
d2a495f190 Mark own comments as read after posting 2016-02-05 16:30:37 +01:00
Robin Appelman
96b592b45b output mount id on create 2016-02-05 15:54:19 +01:00
Robin Appelman
16ad612c83 verify that the auth backend is valid for the storage backend 2016-02-05 15:51:38 +01:00
Joas Schilling
550f3af285 Remove old background job 2016-02-05 15:51:08 +01:00
Robin Appelman
239cdd099a list supported auth backends for storage backends 2016-02-05 15:48:10 +01:00
Vincent Petry
142a2dd2eb Limit comment size to 1000 in UI 
Whenever the limit is almost reached (90% of the length), a tooltip will
appear.

Once the limit is exceeded, the "Post" button will be disabled and the
field will become red.
 2016-02-05 15:45:30 +01:00
Arthur Schiwon
9d2c433b24 fix pgsql 2016-02-05 15:36:21 +01:00
Arthur Schiwon
d537cae063 cleanup jobs for comments and comment read marks 2016-02-05 15:36:21 +01:00
Hendrik Leppelsack
5561e8ebd5 use path instead of text inside desktop app badge 2016-02-05 14:55:53 +01:00
Vincent Petry
995a825dac Make JS Webdav work again with IE9-IE10 2016-02-05 14:48:10 +01:00
Thomas Müller
0196f0e546 Merge pull request #22157 from owncloud/use-https-instead-of-http 
Use HTTPS instead of HTTP
 2016-02-05 14:31:40 +01:00
Robin Appelman
54d2175bf5 Add occ files_external:create command to add new mounts 2016-02-05 14:20:22 +01:00
Roeland Jago Douma
f4edfb6dfb Gracefull handle link shares rename hook 
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
 2016-02-05 13:57:57 +01:00
Thomas Müller
e15a120f83 Merge pull request #22152 from owncloud/activities-for-comments 
Activities for comments
 2016-02-05 13:50:38 +01:00
Hendrik Leppelsack
417ba951da update google play and apple badge 2016-02-05 13:50:03 +01:00
Hendrik Leppelsack
d0bdd5c22c fix font in desktopapp.svg 2016-02-05 13:32:47 +01:00
Thomas Müller
f7e37984be Merge pull request #22153 from owncloud/event-for-console-commands 
Dispatch an event when a console command is run
 2016-02-05 13:30:35 +01:00
Thomas Müller
e6a1e78149 Merge pull request #18194 from RealRancor/proxy_fcgi 
Add mod_proxy_fcgi to .htaccess
 2016-02-05 13:29:41 +01:00
Lukas Reschke
35e4acbc1f Use HTTPS instead of HTTP 
This is now supported by github.io
 2016-02-05 13:05:04 +01:00
Lukas Reschke
53e2736a65 Use SVG for desktop app button 
For the other ones we unfortunately don't have that. Partially addresses https://github.com/owncloud/core/issues/22154
 2016-02-05 13:00:09 +01:00