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

28259 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
5fc414abfd Add internal locking plugin - fixes #20502 2015-11-16 16:09:04 +01:00
Thomas Müller
8169e4fdc8 Merge pull request #20465 from owncloud/forms.css 
Move form styles from styles.css to inputs.css
 2015-11-16 15:29:02 +01:00
Thomas Müller
9ea81b71f5 Merge pull request #20532 from owncloud/ocs-allow-v2 
Allow creating OCS v2 links in JS
 2015-11-16 15:15:53 +01:00
Thomas Müller
28ed2d8072 Merge pull request #20447 from owncloud/heading-styles 
standardize sizes for headings
 2015-11-16 15:01:00 +01:00
Thomas Müller
2cb94cd4eb Merge pull request #20356 from owncloud/share2.0_getShare 
[Share2.0] OCS Share API getShare uses new code
 2015-11-16 15:00:30 +01:00
Thomas Müller
10d2b68f8f Merge pull request #18605 from owncloud/api-adduser-for-subadmins 
enable api addUser for subadmins
 2015-11-16 14:57:27 +01:00
Jan-Christoph Borchardt
5b72d9026f standardize sizes for headings 2015-11-16 14:42:10 +01:00
Joas Schilling
78c456b895 Allow creating OCS v2 links in JS 2015-11-16 14:23:43 +01:00
Thomas Müller
a03b1f1ee9 Merge pull request #20522 from owncloud/update-strengthify 
Update strengthify to 0.4.2
 2015-11-16 13:51:11 +01:00
Roeland Jago Douma
1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Thomas Müller
5e3d29b661 Merge pull request #20505 from owncloud/fakelocking-for-mac 
Add fake locker plugin for WebDAVFS
 2015-11-16 13:15:40 +01:00
Thomas Müller
f0af761fa6 Merge pull request #20463 from owncloud/sharing-api-integration-tests-adding-cases 
Sharing api integration tests adding cases
 2015-11-16 11:54:46 +01:00
Morris Jobke
b1abef77e4 Update strengthify to 0.4.2 
* includes local changes (ported them to upstream - see #10625)
* tipsy -> tooltip
* re-renders the element on scroll of a parent - fixes #20454
 2015-11-16 11:16:38 +01:00
Thomas Müller
650945a2a0 Merge pull request #20510 from owncloud/avatar_unittest_fix 
[Avatar] No need to setup FS for avatar tests
 2015-11-16 10:30:28 +01:00
Jenkins for ownCloud
ae58409f22 [tx-robot] updated from transifex 2015-11-16 01:54:50 -05:00
Jenkins for ownCloud
19d0884b56 [tx-robot] updated from transifex 2015-11-15 01:55:08 -05:00
Roeland Jago Douma
fee6847f48 [Avatar] No need to setup FS for avatar tests 2015-11-14 14:52:51 +01:00
Jenkins for ownCloud
1b409228ab [tx-robot] updated from transifex 2015-11-14 01:55:13 -05:00
Lukas Reschke
a3fc40921b Add fake locker plugin for WebDAVFS 
WebDAVFS as used by Finder requires a Class 2 compatible WebDAV server. This change introduces a fake locking provider which will simply advertise Locking support when a request originates from WebDAVFS. It will also return successful LOCK and UNLOCK responses.
 2015-11-13 23:31:08 +01:00
Jenkins for ownCloud
1e9203cdef [tx-robot] updated from transifex 2015-11-13 01:57:12 -05:00
Hendrik Leppelsack
7ab56de58b move form styles from styles.css to inputs.css 2015-11-13 00:19:57 +01:00
Roeland Jago Douma
fc1f0233ff Added unit test for new functionality 2015-11-12 22:31:17 +01:00
michag86
3b88c469c7 enable api addUser for subadmins 
* Fix existing unit tests
 2015-11-12 22:31:17 +01:00
Thomas Müller
aff4aed43c Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precision 
enable microseconds in log timestamps
 2015-11-12 17:30:32 +01:00
Thomas Müller
6dea6c9dd9 Merge pull request #20478 from owncloud/jnweiger-patch-1 
Update untrustedDomain.php
 2015-11-12 14:55:57 +01:00
Jürgen Weigert
b167eb743f Update untrustedDomain.php 2015-11-12 14:33:59 +01:00
Thomas Müller
3fb440ecf3 Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldap 
changed 1.000 to 1,000
 2015-11-12 13:48:55 +01:00
Sergio Bertolin
ce8435530b Modified test to PUT only 1 parameter with each update 2015-11-12 10:36:17 +00:00
Thomas Müller
e967d88dd7 Merge pull request #20460 from owncloud/file-handling-wording 
fix layout and wording for file handling admin setting
 2015-11-12 11:31:39 +01:00
Christian Schnidrig
d0464bf772 enable microseconds in log timestamps 2015-11-12 10:33:20 +01:00
Thomas Müller
3248db05f1 Merge pull request #17920 from andyboeh/master 
Add possibility for alternative logins to force redirection of login page
 2015-11-12 10:15:23 +01:00
Thomas Müller
af05be1ac7 Merge pull request #20461 from owncloud/assetpipeline-on-upgrade 
Do not use the asset pipeline when doing updates
 2015-11-12 08:51:30 +01:00
Jenkins for ownCloud
9145aa607a [tx-robot] updated from transifex 2015-11-12 01:55:09 -05:00
sylvain
ff17deecd2 changed 1.000 to 1,000 
The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating
 2015-11-12 15:39:57 +09:00
Sergio Bertolin
eb6a13c231 Added a test including all the fields of the share update and checking output 2015-11-11 17:29:38 +00:00
Joas Schilling
c9753655dc Do not use the asset pipeline when doing updates 2015-11-11 18:18:33 +01:00
Thomas Müller
2479363492 Merge pull request #20148 from owncloud/checkbox-accessibility 
Make new checkbox style accessible for screenreaders
 2015-11-11 17:12:38 +01:00
Jan-Christoph Borchardt
0de225e6a6 fix layout and wording for file handling admin setting 2015-11-11 16:45:40 +01:00
Sergio Bertolin
7aeda7c99a Added a test and logic for checking answer of public shares 2015-11-11 14:21:10 +00:00
Jenkins for ownCloud
5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
C. Montero Luque
98d3111c2d Merge pull request #20124 from owncloud/postscriptum-20093 
remove uselessly used parameter, read all user attributes also when l…
 2015-11-10 18:54:28 +01:00
Thomas Müller
dd153a5625 Merge pull request #20176 from owncloud/font-style 
move font back from Light to Regular for body text, fix #18954
 2015-11-10 17:52:09 +01:00
Thomas Müller
b1731245ee Merge pull request #20434 from owncloud/set-ie-class-for-ie10plus 
Set "ie" CSS class for IE10, IE11
 2015-11-10 17:48:10 +01:00
Thomas Müller
0c46f75f6a Merge pull request #20436 from owncloud/checkbox 
use new checkbox style for Apps mgmt settings
 2015-11-10 17:47:24 +01:00
Thomas Müller
27e3d13014 Merge pull request #20429 from owncloud/sharing-api-integration-tests-get-share-by-id 
Added test to get info of a specific share id
 2015-11-10 17:40:35 +01:00
Vincent Petry
a2cd9708f6 Set "ie" CSS class for IE10, IE11 
Fixed border in file action menu
 2015-11-10 17:04:52 +01:00
Sergio Bertolin
7aa6e9b643 Added test to get info of a specific share id 
Check fields of the share response

Added missing fields to check if their values are numbers
 2015-11-10 16:25:34 +01:00
Jan-Christoph Borchardt
83c177fc1b move font back from Light to Regular for body text on normal-res screens, fix #18954 2015-11-10 16:12:42 +01:00
Thomas Müller
e4900c6c4c Merge pull request #20195 from owncloud/add-caldavtester 
Add CalDAVTester to travis
 2015-11-10 16:11:49 +01:00
Robin Appelman
bbe2f5c2d5 Merge pull request #20224 from owncloud/fileinfo-owner 
Add getOwner to FileInfo
 2015-11-10 14:36:15 +01:00