Commit Graph

13224 Commits

Author SHA1 Message Date
Jenkins for ownCloud 14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Thomas Müller d8f327831e Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator
LDAP Wizard: reset connection status indicator when switching LDAP co…
2016-04-25 23:02:23 +02:00
Thomas Müller f6e1b43a38 Merge pull request #22648 from owncloud/propagate-single
do propagation in a single query
2016-04-25 23:01:45 +02:00
Vincent Petry 5e57d3a0b9 Merge pull request #24244 from owncloud/mount-unique
don't get the config for the same mount multiple times
2016-04-25 17:42:20 +02:00
Arthur Schiwon 3e26e1ec16
LDAP Wizard: reset connection status indicator when switching LDAP config 2016-04-25 16:24:44 +02:00
Robin Appelman dbfdc6282a
do propagation in a single query 2016-04-25 16:18:59 +02:00
Thomas Müller 6321596134 Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions
Fix LDAP race conditions
2016-04-25 14:55:20 +02:00
Thomas Müller 972ce1fe6e Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement
Add missing use statement
2016-04-25 14:46:29 +02:00
Robin Appelman ca5b189522 add test 2016-04-25 14:28:01 +02:00
Robin Appelman 7e8fd2c639 don't get the config for the same mount multiple times 2016-04-25 14:21:15 +02:00
Joas Schilling 9491d0f65b
Add missing use statement 2016-04-25 13:22:54 +02:00
Lukas Reschke 604b7a49f6 Merge pull request #24230 from owncloud/you-form-of-activities
Translate the current user with "You ..."
2016-04-25 12:57:34 +02:00
Vincent Petry 7a22e3f083 Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login
on clone Connection, do not take over the existing LDAP resource
2016-04-25 12:38:09 +02:00
Joas Schilling d4c9566cd5
Translate the current user with "You ..." 2016-04-25 10:30:58 +02:00
Björn Schießle 74de72e75e Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
Jenkins for ownCloud dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud 4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Arthur Schiwon 203b0e9cba
on clone Connection, do not take over the existing LDAP resource
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-22 21:43:41 +02:00
Thomas Müller a3813c55da Merge pull request #24124 from owncloud/encryped-size-progation
dont do optimized size propagation for encrypted files
2016-04-22 15:23:42 +02:00
Björn Schießle e10105474f
move federated sharing settings to the federatedfilesharing app 2016-04-22 14:55:40 +02:00
Björn Schießle 606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Thomas Müller 3b3cff4f79 Merge pull request #24151 from owncloud/create-personal-calendar
Personal calendar should be generated even if the birthday calendar a…
2016-04-22 11:09:45 +02:00
Jenkins for ownCloud ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Thomas Müller a1da081c62 Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-page
OCA.Files.App is not available on public page
2016-04-21 23:21:18 +02:00
Thomas Müller 6e4a28ae86 Merge pull request #24155 from owncloud/fix-birthday_calendar-acl
Birthday calendar should never have write acl
2016-04-21 16:49:21 +02:00
Björn Schießle 80959ad95a Merge pull request #24111 from owncloud/chunk-users-in-background-jobs
Chunk the users correctly in the trashbin and versions background job
2016-04-21 14:26:41 +02:00
Christoph Wurst df2a9d1733
OCA.Files.App is not available on public page 2016-04-21 14:23:18 +02:00
Thomas Müller 1d1247069f
Birthday calendar should never have write acl - fixes #24154 2016-04-21 13:36:52 +02:00
Robin Appelman b7867e9368 Add unit tests for shared size propagation with encryption 2016-04-21 13:13:18 +02:00
Thomas Müller 38c7296867
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082 2016-04-21 12:34:20 +02:00
Vincent Petry b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements
Enc master key improvements
2016-04-21 11:48:26 +02:00
Jenkins for ownCloud 02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Morris Jobke 62a59854f0
Fix LDAP race conditions
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
2016-04-20 21:50:28 +02:00
Thomas Müller 1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
migrate deprecated jQuery 1.x functions
2016-04-20 20:38:38 +02:00
Thomas Müller cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example
SharedStorage to new sharing code + cleanup
2016-04-20 20:37:27 +02:00
Björn Schießle e906796f99
ask for share-permissions on propfind 2016-04-20 17:47:32 +02:00
Thomas Müller 34b753baa0 Merge pull request #23952 from owncloud/hide-hidden-files
Add option to hide hidden files
2016-04-20 11:58:38 +02:00
Thomas Müller aa33ab0c03 Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test
Move the group dummy backend to test
2016-04-20 11:55:00 +02:00
Thomas Müller a6676f31ec Merge pull request #24097 from owncloud/fix_23632
init users mount point before recovery
2016-04-20 11:54:45 +02:00
Joas Schilling 9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:36:15 +02:00
Björn Schießle 17eb11cce8 Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments
Always add activities for comments to the stream
2016-04-20 10:21:09 +02:00
Björn Schießle a3381b1d0c
we need to initialize the mount points of the given user before we recover
access to his files
2016-04-19 17:04:21 +02:00
Christoph Wurst e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') 2016-04-19 16:20:17 +02:00
Christoph Wurst 6c5696d3a8
filter hidden files on the web interface
add checkbox to toggle show/hide hidden files

persist show hidden setting

fix settings menu layout

test ApiController::showHiddenFiles

don't show hidden files by default

Store config in Backbone model and inject it into FileList

Filter files only temporarily when rending the file list

Fix file rename validation
2016-04-19 16:08:56 +02:00
Thomas Müller 5b2ef92eb2 Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user
Introduce isReadyForUser and verify in file transfer ownership
2016-04-19 15:56:47 +02:00
Roeland Jago Douma dd7e0d13e5
Move the group dummy backend to test
The dummy backend is only used for testing and should thus reside in
tests.
2016-04-19 15:13:31 +02:00
Christoph Wurst 05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Lukas Reschke a86fd873d6 Merge pull request #24076 from owncloud/fix-initial-calendar-and-addressbook-names
Fix displayname for initial calendars and address books
2016-04-19 14:30:35 +02:00
Roeland Douma 0c5f915377 Merge pull request #24054 from owncloud/data_fingerprint
Add data-fingerprint property
2016-04-19 14:24:27 +02:00