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

27753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jörn Friedrich Dreyer
aab226cef7 don't move files in cache twice, fixes renaming for objectstores 2015-10-16 21:41:51 +02:00
Thomas Müller
6cd1126dd1 Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory 
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
 2015-10-16 21:28:55 +02:00
Roeland Douma
0f309c0977 Merge pull request #19820 from owncloud/properError_sharing_with_owner 
When sharing with the owner show the path
 2015-10-16 21:26:30 +02:00
Roeland Jago Douma
8fdb12f8fb Check for error when resharing 2015-10-16 20:43:17 +02:00
Roeland Jago Douma
9e86d71cc5 When sharing with the owner show the path 
The error message should contain the path that is being shared not the
numeric id.
 2015-10-16 20:43:17 +02:00
C. Montero Luque
9e6a4dce43 Merge pull request #19821 from owncloud/GreenArchon-fix-memberof-regression 
Revert "adjust to nested group fix
 2015-10-16 13:39:57 -04:00
Thomas Müller
8a036842aa Fix failing unit test 2015-10-16 17:36:27 +02:00
Thomas Müller
a2ec080427 an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory 2015-10-16 17:25:22 +02:00
Thomas Müller
9d910deef0 Merge pull request #19836 from owncloud/share-fix-spinner-position 
Fix spinner positions in share tab
 2015-10-16 17:17:01 +02:00
Thomas Müller
7e9714340e Merge pull request #19831 from owncloud/ext-dropbox-removecacheafterupload 
Remove Dropbox metadata from cache after upload
 2015-10-16 16:45:18 +02:00
Thomas Müller
97d4093891 Merge pull request #19828 from owncloud/ie9-placeholder-sickness 
[IE9] Prevent LDAP password field to become plain text
 2015-10-16 16:44:55 +02:00
Thomas Müller
c47c1df580 Merge pull request #18688 from owncloud/dav-app 
Consolidate webdav code - move all to one app
 2015-10-16 16:30:59 +02:00
Vincent Petry
90e34e26bd Fix spinner positions in share tab 
Also fix missing spinner when removing link share
 2015-10-16 15:54:27 +02:00
Vincent Petry
796179af00 Remove Dropbox metadata from cache after upload 
This will make sure that the next calls that read the mtime will get the
correct value.
 2015-10-16 13:47:00 +02:00
Vincent Petry
c406efe74f [IE9] Prevent LDAP password field to become plain text 
The placeholders library converts the password field to a text field to
achieve placeholders functionality. However this is buggy and doesn't
properly mask the password when it was set through $el.val().

This workaround sets the type back to password directly after setting a
value.
 2015-10-16 13:25:16 +02:00
Morris Jobke
ff5ed44330 Fix typo and adjust required version 2015-10-16 13:17:12 +02:00
Roeland Jago Douma
ca27024fa2 Fix webdav access 
* Correct namespace
* Pass the EventDispatcher to the webDAV server
 2015-10-16 13:17:12 +02:00
Thomas Müller
8fa59033ac Fix uni tests 2015-10-16 13:17:12 +02:00
Thomas Müller
2ff55560e2 Remove $ETagFunction - it was never used 2015-10-16 13:17:12 +02:00
Thomas Müller
f2889dc6e4 Consolidate webdav code - move all to one app 2015-10-16 13:17:12 +02:00
Thomas Müller
4b9ec49285 Merge pull request #19823 from owncloud/require-idn 
Run test only when idn is available
 2015-10-16 12:52:53 +02:00
Roeland Douma
f6d808e2de Merge pull request #19822 from owncloud/share-checkboxuniqueids 
Fix DOM element ids in share dialog
 2015-10-16 12:38:39 +02:00
Lukas Reschke
e0d6bd5b6d Run test only when idn is available 
IDN is not installed on all machines making the unit test execution fail on those without. Let's make IDN thus a pre-requirement for the text execution.
 2015-10-16 11:02:10 +02:00
Vincent Petry
3af2ad0cd9 Fix DOM element ids in share dialog 
- Rely on class names instead of global ids
- When global ids are needed for label+checkbox, append the view id
  (cid) to the element's id

This fixes the checkboxes when multiple sidebars exist in the DOM.
 2015-10-16 10:54:45 +02:00
Lukas Reschke
d486949705 Adjust unit tests 2015-10-16 10:37:08 +02:00
Lukas Reschke
733542a264 Fix style 2015-10-16 10:36:38 +02:00
Frédéric Fortier
f178f612d8 Revert "adjust to nested group fix 
This reverts commit 845485cfe, which fixes #19816 regression.
 2015-10-16 09:39:07 +02:00
Jenkins for ownCloud
7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Thomas Müller
e4528c3bf7 Merge pull request #19814 from owncloud/filelist-preventerrorwhennosidebar 
Do not register sidebar panels when no sidebar
 2015-10-15 19:59:37 +02:00
Thomas Müller
08cc60acba Merge pull request #19806 from owncloud/fix_19572 
only wrap source if fopen was successful
 2015-10-15 19:57:24 +02:00
Thomas Müller
f50f78dd9b Merge pull request #19795 from owncloud/fix-language-level-compat 
Remove arbitrary expression in empty
 2015-10-15 16:42:32 +02:00
Thomas Müller
09d7230921 Merge pull request #19802 from RealRancor/fix_rewrites 
Remove legacy non-working rewrites in .htaccess
 2015-10-15 16:40:15 +02:00
Vincent Petry
204b3ca189 Do not register sidebar panels when no sidebar 2015-10-15 16:30:50 +02:00
Bjoern Schiessle
dd6cb67030 check if fopen was successful before continue 2015-10-15 16:27:38 +02:00
Bjoern Schiessle
c7883b1769 only wrap source if fopen was successful 2015-10-15 16:27:38 +02:00
RealRancor
64cb226bfb Remove legacy non-working rewrites in .htaccess 2015-10-15 14:22:43 +02:00
Thomas Müller
b876f8b2a7 Merge pull request #19797 from owncloud/specify-php-5-4 
Specify PHP 5.4 as version for scrutinizer
 2015-10-15 14:02:00 +02:00
Lukas Reschke
89c631f37b Merge pull request #19799 from owncloud/issue-19793-php54-ldap-comp-issue 
Fix doc blocks of LDAP classes
 2015-10-15 12:59:30 +02:00
Joas Schilling
24420e9eb1 Fix doc blocks of LDAP classes 2015-10-15 08:29:35 +02:00
Jenkins for ownCloud
5bee7007dd [tx-robot] updated from transifex 2015-10-15 01:55:32 -04:00
Lukas Reschke
d0cc8f5cee Specify PHP 5.4 as version for scrutinizer 
Let's see if this helps for cases such as https://github.com/owncloud/core/issues/19793
 2015-10-14 22:50:47 +02:00
Lukas Reschke
4e5eb3b828 Remove arbitrary expression in empty 
Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4

Fixes https://github.com/owncloud/core/issues/19793
 2015-10-14 22:35:46 +02:00
Thomas Müller
905474ebd4 Merge pull request #19787 from owncloud/kill-arrayparser 
Remove ArrayParser because it is unused
 2015-10-14 17:48:45 +02:00
Morris Jobke
d392ddab70 Remove ArrayParser because it is unused 2015-10-14 16:50:56 +02:00
Thomas Müller
fbccdedb5c Merge pull request #19731 from owncloud/update-list-of-deprecated-methods 
Update list of deprecated methods
 2015-10-14 16:34:55 +02:00
Thomas Müller
ba461b0c92 Merge pull request #19760 from owncloud/adding_occ_upgrade_text_note 
Adding occ upgrade text note
 2015-10-14 16:33:33 +02:00
Joas Schilling
d904a09a04 The constant is now deprecated 2015-10-14 15:29:38 +02:00
Thomas Müller
db4dae527c Merge pull request #19764 from owncloud/issue-19759-app-check-code-issue 
Variables don't have a class, so we can't use toString() on it
 2015-10-14 14:10:25 +02:00
Morris Jobke
aa10825026 update deprecation message 2015-10-14 14:08:45 +02:00
Joas Schilling
e2806b0ae8 Update list of deprecated methods 2015-10-14 14:08:45 +02:00