Thomas Müller
9eea062004
Merge pull request #24433 from owncloud/user_psr4
...
lib/private/user to PSR-4
2016-05-11 11:16:56 +02:00
Thomas Müller
199b447527
Yo-ho-oh - Murder all band 'o pirates
2016-05-11 09:16:17 +02:00
Jenkins for ownCloud
7da5331782
[tx-robot] updated from transifex
2016-05-11 01:55:55 -04:00
Morris Jobke
e2748e4cbf
fix usage of legacy class in LDAP
2016-05-10 19:53:36 +02:00
Vincent Petry
510724716d
Merge pull request #24401 from owncloud/trash-list-cache
...
use the cache for trash listing
2016-05-10 17:12:49 +02:00
Lukas Reschke
e8e72aa910
Merge pull request #24434 from owncloud/permalinks
...
Permalinks
2016-05-10 09:44:50 +02:00
Jenkins for ownCloud
1fb7be42e5
[tx-robot] updated from transifex
2016-05-10 03:30:51 -04:00
Morris Jobke
fdda980c2f
Merge pull request #24466 from owncloud/issue_13936_wording_ldap
...
wording in LDAP wizard
2016-05-09 08:27:00 +02:00
Jenkins for ownCloud
10e0fc0629
[tx-robot] updated from transifex
2016-05-09 02:08:23 -04:00
Jenkins for ownCloud
5d35844aff
[tx-robot] updated from transifex
2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
956c3f2719
[tx-robot] updated from transifex
2016-05-07 01:54:56 -04:00
Vincent Petry
254576e1f7
Do not encode slashes in "dir" URL param in files JS
2016-05-06 17:00:22 +02:00
Vincent Petry
112b703df0
Add anchor icon in sidebar to copy permalink
2016-05-06 16:46:59 +02:00
Vincent Petry
fdeafef6a0
Auto-add fileid in URL for currently displayed folder
2016-05-06 16:46:59 +02:00
Vincent Petry
093e9dd422
Add route to resolve fileid to files app URL
...
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
2016-05-06 16:46:59 +02:00
Vincent Petry
47157bcd76
Merge pull request #24400 from owncloud/cache_shareManager
...
Cache shareManager
2016-05-06 14:25:30 +02:00
Jenkins for ownCloud
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a
[tx-robot] updated from transifex
2016-05-05 01:55:08 -04:00
davicente
452eeeb344
wording in LDAP wizard
2016-05-04 17:25:44 +01:00
Jenkins for ownCloud
cd7f4ed96f
[tx-robot] updated from transifex
2016-05-04 02:11:59 -04:00
Roeland Douma
2e4b41550e
Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications
...
Move comments, systemtags and updatenotifications to PSR-4
2016-05-04 08:03:11 +02:00
blizzz
2fd4f1a775
Merge pull request #24396 from owncloud/ctrlEnter-submit-comment
...
Adds functionality to submit comment on ctrl+Enter
2016-05-03 22:24:17 +02:00
Thomas Müller
4b2544925f
Merge pull request #23844 from owncloud/disable-user
...
Add occ commands to enable and disable a user + a disabled user can n…
2016-05-03 15:22:41 +02:00
Lukas Reschke
0d8393178b
Use proper path
...
Fixes https://github.com/owncloud/core/issues/24407
2016-05-03 14:37:50 +02:00
Robin Appelman
435cd31fa6
use the cache for trash listing
2016-05-03 14:36:46 +02:00
Lukas Reschke
df2eb96cc4
Merge pull request #24389 from owncloud/login-by-email
...
Allow login by email address
2016-05-03 13:44:38 +02:00
Robin McCorkell
ac27163f68
Move Dropbox/GDrive link to icon
2016-05-03 11:30:02 +01:00
Robin McCorkell
a09ef66eea
Change colour of input fields instead of printing 'Access granted'
2016-05-03 11:30:02 +01:00
Robin McCorkell
43abe2b648
Add links to load GDrive/Dropbox configuration pages
2016-05-03 11:30:02 +01:00
Robin McCorkell
de98a6e54c
Allow multiple custom JS files
2016-05-03 11:30:02 +01:00
Vincent Chan
5f2a19e965
fixes indentation
2016-05-03 12:29:43 +02:00
Vincent Chan
bc0d136511
adds functionality to submit comments with cmd+Enter
2016-05-03 12:26:05 +02:00
Thomas Müller
f8c04a4219
Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml
...
Declare cron jobs in info.xml
2016-05-03 12:03:28 +02:00
Joas Schilling
9ad4a89816
Move comments, systemtags and updatenotifications to PSR-4
2016-05-03 10:20:59 +02:00
Morris Jobke
547830d97e
Merge pull request #22989 from owncloud/lock_sharing_ops
...
Add locking to modifying operation of the OCS Share API
2016-05-03 10:15:54 +02:00
Thomas Müller
cc1d948c2e
Add background job declaration of dav app to info.xml
2016-05-03 08:58:12 +02:00
Jenkins for ownCloud
1974ae8da7
[tx-robot] updated from transifex
2016-05-03 01:57:34 -04:00
Roeland Douma
3835d94d41
Merge pull request #24394 from owncloud/cleanup_share_classmap
...
Cleanup Files_Sharing CLASSPATH
2016-05-03 07:40:52 +02:00
Roeland Jago Douma
3c2fee8775
Cache shareManager
...
There is no need to call \OC::$server->getShareManager for each Node.
We have it available so better pass it around.
2016-05-02 22:27:24 +02:00
Vincent Chan
7ac1cb68f6
Submit comment on ctrl+Enter
...
closes #24302
2016-05-02 19:52:13 +02:00
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH
...
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
2016-05-02 16:15:40 +02:00
Thomas Müller
b10dcfc3b7
Fixing local event delivery for calendar events based on the email address
2016-05-02 14:20:59 +02:00
Joas Schilling
7bfc617b03
Move activity manager to the namespace
2016-05-02 11:57:24 +02:00
Joas Schilling
b8650be732
Merge pull request #24238 from owncloud/caldav-test-event-in-far-future
...
Test an event in the far future
2016-05-02 10:42:47 +02:00
Roeland Douma
5a62c74495
Merge pull request #24376 from owncloud/remove_dead_code
...
Remove dead code
2016-05-02 09:57:28 +02:00
Morris Jobke
6b12f96b14
Merge pull request #24341 from owncloud/scan-nfd-showwarning
...
Add files:scan warning when NFD or incompatible encoding found
2016-05-02 09:41:12 +02:00
Thomas Müller
8486926a14
Add provisioning api to enable and disable users
2016-05-02 09:31:22 +02:00
Roeland Jago Douma
45d618a133
Remove dead code
...
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
Jenkins for ownCloud
a323111bd1
[tx-robot] updated from transifex
2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c
[tx-robot] updated from transifex
2016-05-01 01:55:00 -04:00
Roeland Jago Douma
8a652d1238
Unlock before all returns
2016-04-30 11:34:06 +02:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation
...
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
Roeland Jago Douma
62bc53143e
Add locking to modifying operation of the OCS Share API
...
Fixes #17243
This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.
* Updated unit tests to work with logging
2016-04-30 10:32:35 +02:00
Jenkins for ownCloud
023c8b0eac
[tx-robot] updated from transifex
2016-04-30 01:55:54 -04:00
Vincent Petry
4326d73ff6
Fix SMB storage to not normalize UTF8
...
This makes sure that even if a NFD file name exists, it is found by the
storage and will be visible to higher layers. Even though the file will
be discarded anyway there, it gives the scanner a chance to display a
warning at least.
2016-04-29 16:19:53 +02:00
Vincent Petry
61203eee04
Add files:scan warning when NFD or incompatible encoding found
2016-04-29 16:18:59 +02:00
Thomas Müller
dda942a917
firstoccurence and lastoccurence have a length now - triggering BIGINT on postgres - refs #24221
2016-04-29 14:57:19 +02:00
Thomas Müller
22ff97256e
Test an event in the far future - refs #24221
2016-04-29 14:57:19 +02:00
Jenkins for ownCloud
1f63e8df61
[tx-robot] updated from transifex
2016-04-29 01:54:56 -04:00
Vincent Petry
6ec835c1da
Merge pull request #24287 from owncloud/smb-110
...
update icewind/streams to 1.1.0
2016-04-28 14:08:51 +02:00
Jenkins for ownCloud
ba0099f73a
[tx-robot] updated from transifex
2016-04-28 01:55:14 -04:00
Thomas Müller
44709276c0
Merge pull request #22777 from owncloud/encrypt_all_master_key
...
improved encrypt-all script
2016-04-27 09:48:46 +02:00
Jenkins for ownCloud
2b67f87ea8
[tx-robot] updated from transifex
2016-04-27 01:55:59 -04:00
Robin Appelman
1cc17436f7
update icewind/streams to 1.1.0
2016-04-26 15:43:30 +02:00
Thomas Müller
887045b790
Merge pull request #24027 from owncloud/translate_ocs_share
...
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
Bjoern Schiessle
d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away
2016-04-26 11:06:55 +02:00
Bjoern Schiessle
088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled
2016-04-26 11:06:55 +02:00
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
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +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