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

27503 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Thomas Müller
da640adf68 Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotingroup 
Remove invalid share items from result when missing group membership
 2015-10-06 09:24:22 +02:00
Thomas Müller
822e8fbfe1 Merge pull request #19535 from owncloud/check-memcache-module 
[admin] check for correct PHP memcached module
 2015-10-06 09:24:03 +02:00
Thomas Müller
26b92c406c Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sharing-subfile 
Make sure the share we found is for the same item
 2015-10-06 09:23:44 +02:00
Thomas Müller
1525ef43f9 Merge pull request #18484 from owncloud/fix-17964 
Remove whitespace from base-DNs
 2015-10-06 09:23:24 +02:00
Morris Jobke
b519965408 [admin] check for correct PHP memcached module 2015-10-06 08:51:47 +02:00
Jenkins for ownCloud
3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Thomas Müller
0577eed14e Merge pull request #18883 from owncloud/encryption-move-same-storage 
use a normal rename when moving from the same storage in the encryption wrapper
 2015-10-05 22:02:33 +02:00
Thomas Müller
ea72d90617 Merge pull request #19553 from owncloud/properly_format_date_shareview 
Use DD-MM-YYYY consistently in share sidebar
 2015-10-05 22:02:12 +02:00
Thomas Müller
94c0cc1bb3 Merge pull request #19590 from owncloud/compactmode-sidebarfullscreen 
Make sidebar properly fullscreen in mobile/compact mode
 2015-10-05 22:01:41 +02:00
Roeland Douma
97bade9108 Merge pull request #19558 from owncloud/sharing_sidebar_toggle_enforcedpass 
Do not remove linkshare if there is none
 2015-10-05 21:40:37 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Morris Jobke
a0c950bf88 Update license header script to only use code changes 
* ignores the first lines of a file with the license header
 2015-10-05 21:15:51 +02:00
Roeland Jago Douma
8c459a895d Do not remove linkshare if there is none 
If the password is enforced we can't create a link share right away but
just show the password field. Untoggling the link sharing should not try
to remove the share.

* Added unit test
 2015-10-05 21:12:27 +02:00
Robin Appelman
b1ce53f890 use a normal rename when moving from the same storage in the encryption wrapper 2015-10-05 20:55:57 +02:00
Hendrik Leppelsack
cf9fb034c4 Merge pull request #19591 from owncloud/files-renametooltipplacement 
Fix tooltip placement on rename error
 2015-10-05 18:29:18 +02:00
Vincent Petry
c17d60165a Fix tooltip placement on rename error 2015-10-05 17:44:25 +02:00
Vincent Petry
bc727d67ca Make sidebar properly fullscreen in mobile/compact mode 2015-10-05 17:34:28 +02:00
Vincent Petry
1c7244c120 Remove invalid share items from result when missing group membership 
Group shares usually have subshare entries for every user. In some
situations it can happen that the user was removed from the group but
the subshare entries still exist.

This fix makes sure that such subshare entries are not returned any more
as the user isn't in the group any more.
 2015-10-05 17:21:34 +02:00
Morris Jobke
cab0be6eed Merge pull request #19582 from owncloud/fix_19456 
add some output to explain the pre-conditions for decrypt-all
 2015-10-05 13:56:02 +02:00
Arthur Schiwon
fc273ac88c trim by default, add unit tests 2015-10-05 13:42:20 +02:00
Lennart Rosam
70ffa2f9f8 Spaces -> Tabs, Update PHP-Doc and function logic 2015-10-05 13:42:20 +02:00
Lennart Rosam
b47d15cd20 Remove whitespace from base-DNs 2015-10-05 13:42:20 +02:00
Bjoern Schiessle
bf82015254 add some output to explain the pre-conditions for decrypt-all 2015-10-05 12:41:05 +02:00
Joas Schilling
ac5b3161e4 Add a unit test for "share a file inside a folder that is already shared" 2015-10-05 12:36:16 +02:00
Joas Schilling
3bbb65998f Make sure all variables are defined 2015-10-05 12:03:36 +02:00
Joas Schilling
8de0773214 Make sure the share we found is for the same item 2015-10-05 11:55:37 +02:00
Thomas Müller
f4885f6da3 Merge pull request #19576 from owncloud/update-example-theme 
Update example theme with App URLs and PHPDoc
 2015-10-05 11:42:34 +02:00
Morris Jobke
ed2ed4be8d Update example theme with App URLs and PHPDoc 2015-10-05 11:15:14 +02:00
Thomas Müller
34951efed6 Merge pull request #19574 from owncloud/fix-sharing-tests-assuming-empty-share-table 
Clear the shares after the test like storages and files
 2015-10-05 11:00:34 +02:00
Thomas Müller
710b7dd81c Merge pull request #19487 from owncloud/split_share_middleware 
Split files_sharing middelware
 2015-10-05 10:57:11 +02:00
Thomas Müller
56c35da8d5 Merge pull request #19416 from owncloud/node-hook-connector 
pass view hooks trough to the node hooks
 2015-10-05 10:25:04 +02:00
Thomas Müller
28919faff5 Merge pull request #19552 from owncloud/inline_fileactions_alttext 
If an inline files action provides an alt text show it
 2015-10-05 10:24:48 +02:00
Joas Schilling
42b29e39c1 Clear the shares after the test like storages and files 2015-10-05 10:13:45 +02:00
Thomas Müller
681ab05e4d Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter 
Fix filelist size issues, breadcrumb, multiselect
 2015-10-05 09:48:31 +02:00
Thomas Müller
09fe808d48 Merge pull request #19547 from owncloud/fix-16154 
LDAP Wizard: do not be picky about credentials when only looking for …
 2015-10-05 09:48:13 +02:00
Jörn Friedrich Dreyer
11574eaa90 Merge pull request #19560 from owncloud/add-note-about-x-forwarded-for 
Add notice about X-Forwarded-For
 2015-10-05 09:14:51 +02:00
Lukas Reschke
94f2121980 Add notice about X-Forwarded-For 2015-10-05 09:10:07 +02:00
Jenkins for ownCloud
bc593f7921 [tx-robot] updated from transifex 2015-10-05 01:54:55 -04:00
Roeland Jago Douma
96deeca34d Use DD-MM-YYYY consistently in share sidebar 
We used to display the response from the server. Which is in non ISO8601
format. Now this is weird since the datepickers shows us 'DD-MM-YYYY'
once a date is chosen.

Now use momentJS to properly format the date.

* Unit tests updated
 2015-10-04 11:38:29 +02:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Roeland Jago Douma
6bf6ff9564 If an inline files action provides an alt text show it 
* Added unit tests for icon display
* Added unit tests for icon alt text display
 2015-10-03 15:47:20 +02:00
Thomas Müller
122141be92 Merge pull request #19543 from owncloud/fix-19542 
Check if decoded JSON returned null
 2015-10-03 12:20:33 +02:00
Thomas Müller
99d7352ef9 Merge pull request #19545 from owncloud/fix-16908 
Add remark that $run is not supported anymore
 2015-10-03 10:17:36 +02:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Arthur Schiwon
6d06d1c5a4 LDAP Wizard: do not be picky about credentials when only looking for the port 2015-10-03 00:35:24 +02:00
Lukas Reschke
f6e055b2fd Add remark that $run is not supported anymore 
Fixes https://github.com/owncloud/core/issues/16908
 2015-10-02 23:19:26 +02:00
Lukas Reschke
8f4611e21d Check if decoded JSON returned null 
The value might return null resulting in a PHP error.

Fixes https://github.com/owncloud/core/issues/19542
 2015-10-02 21:56:20 +02:00
Thomas Müller
94013ffb82 Merge pull request #19534 from owncloud/fix_19532 
if the mountpoint is accessible for all user the array should contain 'all'
 2015-10-02 18:40:50 +02:00