Commit graph

27219 commits

Author SHA1 Message Date
Thomas Müller
787c668b39 Merge pull request #19360 from owncloud/move-filter-method-into-config-object
Move the filtering of sensitive data to the config class
2015-09-25 14:05:04 +02:00
Thomas Müller
68bf4440d3 Merge pull request #19293 from owncloud/individual-it-move_initTemplate
[jenkins] do not load unnecessary code in case of webdav
2015-09-25 13:49:51 +02:00
Thomas Müller
2c37d5f7d8 Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email
Publish an activity when sending a share link via email
2015-09-25 13:48:33 +02:00
Joas Schilling
ab69a22606 Deduplicate constant 2015-09-25 13:17:23 +02:00
Thomas Müller
57b2778053 Merge pull request #19356 from owncloud/add-l10n-factory-to-interface
Add the L10N Factory to the container interface
2015-09-25 13:06:27 +02:00
Individual IT Services
db84791bb0 Todo for myself to eliminate double code
This will be in a new PR
2015-09-25 15:43:12 +05:45
Individual IT Services
2e42f99d00 add $prepend option to addStyle() & addVendorStyle() 2015-09-25 15:41:55 +05:45
Joas Schilling
1694f21387 Add the method to the mock 2015-09-25 11:16:26 +02:00
Joas Schilling
faba02564a Move the filtering of sensitive data to the config class 2015-09-25 11:08:33 +02:00
Raghu Nayyar
bf73665a35 Merge pull request #19329 from owncloud/checkbox-class
Add .checkbox class for new checkbox style
2015-09-25 14:02:39 +05:30
Joas Schilling
e91e36f8df Add the L10N Factory to the container interface 2015-09-25 09:05:12 +02:00
Hendrik Leppelsack
604f5783fd fix multiselect 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
c23cac3322 fix login 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
dba9211d5d fix filecomparator 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
28d3c1cc0b fix filelist checkboxes 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
ec005fc5d0 add .checkbox class for new checkbox style 2015-09-25 00:51:39 +02:00
Thomas Müller
e7bc2a10e3 Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue
fix issue with version rollback and thumbnails
2015-09-24 21:06:27 +02:00
Lukas Reschke
320a4eb149 Merge pull request #19349 from owncloud/revert-18692-patch-2
Revert "Update apps.css (Scroll more smoothly for Webkit browser)"
2015-09-24 19:30:43 +02:00
Jan-Christoph Borchardt
43eeb290c1 Revert "Update apps.css (Scroll more smoothly for Webkit browser)" 2015-09-24 18:42:23 +02:00
Thomas Müller
ebdd6d96ce Merge pull request #19306 from owncloud/app-code-check-version
[App Code Check] add check for version and mandatory fields
2015-09-24 17:38:48 +02:00
Morris Jobke
03bf2f786a public, remote and default_enable are not deprecated 2015-09-24 16:47:00 +02:00
Thomas Müller
846b826867 Merge pull request #18517 from owncloud/17753_to_master
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Thomas Müller
30377e958f Merge pull request #18834 from owncloud/delay-listen-owner-changes
Delay listening to owner changes untill we use a share for that owner
2015-09-24 15:06:27 +02:00
Thomas Müller
d7a923671f Merge pull request #19305 from owncloud/share-hasusershares
Fix ShareItemModel.hasUserShares to only check shares of current item
2015-09-24 14:57:23 +02:00
Thomas Müller
bf4c144c6f Merge pull request #19335 from owncloud/phil-davis-view-typos
Comment typos in tests/lib/files/view.php
2015-09-24 14:54:21 +02:00
Thomas Müller
5ee46c8500 Merge pull request #19337 from owncloud/fix-shipped-check-for-apps
Correctly check whether an app is shipped
2015-09-24 14:51:59 +02:00
Thomas Müller
383f381489 Merge pull request #19340 from owncloud/enc_fix_user_check
only check if the user exists if a user was added as parameter
2015-09-24 14:51:38 +02:00
Thomas Müller
594a31d260 Merge pull request #19341 from owncloud/enc_all_improved_messages
no need to list users if all users already had a key-pair
2015-09-24 14:51:18 +02:00
Thomas Müller
c11bfa9177 Merge pull request #19342 from owncloud/fix-15836
LDAP Wizard: enable/disable test login name button depending on wheth…
2015-09-24 14:50:57 +02:00
Thomas Müller
99cf17247e Merge pull request #19339 from owncloud/share-expirationisstring
Expiration date was always a string
2015-09-24 13:45:17 +02:00
Arthur Schiwon
8e57757045 LDAP Wizard: enable/disable test login name button depending on whether a login name is provided or not 2015-09-24 13:33:37 +02:00
Morris Jobke
5a3e57c2f5 encode arrays as string 2015-09-24 12:48:44 +02:00
Bjoern Schiessle
90f1e3dc94 no need to list users if all users already had a key-pair 2015-09-24 12:47:46 +02:00
Thomas Müller
8d6ec660a2 Merge pull request #19248 from owncloud/allow-status-code-403-and-503-for-listeners
Convert exceptions to SabreExceptions for the HTTP status code
2015-09-24 12:35:37 +02:00
Bjoern Schiessle
d697ea58a4 only check if the user exists if a user was added as parameter 2015-09-24 12:21:40 +02:00
Vincent Petry
76e30d0df7 Expiration date was always a string 2015-09-24 12:21:19 +02:00
Joas Schilling
9da4869cd4 Correctly check whether an app is shipped 2015-09-24 12:06:29 +02:00
Morris Jobke
9b652ed5d5 [App Code Check] add check for version and mandatory fields
* ref #17598
* including unit tests for mandatory fields/versions
2015-09-24 11:58:12 +02:00
Thomas Müller
330ea18996 Merge pull request #19303 from owncloud/usecorrectvariable
Use correct variable
2015-09-24 11:34:19 +02:00
Thomas Müller
4621d4ed21 Merge pull request #19313 from owncloud/ext-validate-mount
Validate storage backend and auth mechanism before mounting
2015-09-24 11:33:57 +02:00
Thomas Müller
3903ba7ffa Merge pull request #19328 from owncloud/update-shipped-apps-list
Update the list of shipped apps
2015-09-24 11:18:11 +02:00
Phil Davis
9f9bdd8f90 Comment typos in tests/lib/files/view.php
Correct a comment typo just introduced at line 892, plus another and some white space at EOL.
2015-09-24 15:01:45 +05:45
Thomas Müller
5a11e145da Clean code 2015-09-24 11:03:01 +02:00
Thomas Müller
11974477bd Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null
Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder
2015-09-24 10:57:49 +02:00
Thomas Müller
df75c17e52 Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches
Prevent wrong matches in getRelativePath
2015-09-24 10:25:00 +02:00
Joas Schilling
2d557b065f Remove user_webdavauth which is now part of user_external 2015-09-24 09:59:14 +02:00
Joas Schilling
70572c1e3c Allow set('column', 'null') to work like in Doctrine 2015-09-24 09:53:09 +02:00
Thomas Müller
158c962fcc Merge pull request #19307 from owncloud/large-sidebar-preview-resize
adjust the height of the sidebar preview image when resizing the browser
2015-09-24 09:44:35 +02:00
Thomas Müller
13cca93929 Merge pull request #19292 from owncloud/close-icon
add slight shadow to close icon to make it visible on top of dark images
2015-09-24 09:44:13 +02:00
Thomas Müller
8c0cf07d2f Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blocker
Implement the autocomplete blocker from #18341 into the OCS endpoint
2015-09-24 09:43:37 +02:00