Commit graph

11149 commits

Author SHA1 Message Date
Jenkins for ownCloud
24d2cbf3de [tx-robot] updated from transifex 2015-09-15 01:54:50 -04:00
Lukas Reschke
4a777d686b Merge pull request #18966 from owncloud/ext-remove-numeric-id
Remove storing storage_id in mount.json
2015-09-14 15:04:23 +02:00
Lukas Reschke
1369525e7f Merge pull request #18982 from owncloud/fix_18878
enforce loading icon in sidebar to be 32x32
2015-09-14 12:47:53 +02:00
Individual IT Services
04db96adaf Merge pull request #19006 from owncloud/individual-it-patch-1
allow ".." in folder names
2015-09-14 15:56:53 +05:45
Jenkins for ownCloud
211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Individual IT Services
f7e66d49fc allow ".." in folder names
".." are valid in folder names, only ".." by itself is invalid
fix for #18987
2015-09-14 10:42:00 +05:45
Robin McCorkell
522619f90e Fix dependency check for Swift and SMB_OC
Mistake caused during merging, where the API had changed
2015-09-13 21:41:02 +01:00
Robin McCorkell
0dc7181335 Merge pull request #18441 from owncloud/ext-backends.advanced
Migrate advanced external storage backends to new registration API [part 3]
2015-09-13 19:38:22 +01:00
Jenkins for ownCloud
ca921fa1e7 [tx-robot] updated from transifex 2015-09-13 01:55:24 -04:00
Jenkins for ownCloud
9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Georg Ehrke
4660fefd01 enforce loading icon in sidebar to be 32x32 2015-09-11 18:15:36 +02:00
Robin McCorkell
57e49d2005 Merge pull request #18733 from owncloud/ext-dependencycheck
Make checkDependencies a real method
2015-09-11 09:46:40 +01:00
Robin McCorkell
e99988b9c7 Merge pull request #18676 from owncloud/ext-eventdispatcher
files_external event dispatcher
2015-09-11 09:34:05 +01:00
Jenkins for ownCloud
ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Robin McCorkell
d67251fe4c Remove storing storage_id in mount.json
One mount configuration does not necessarily map to a single storage,
due to `$user` substitution or special auth mechanisms.
2015-09-10 22:09:42 +01:00
Lukas Reschke
fb717f254f Merge pull request #18699 from owncloud/notification-manager
Notification manager
2015-09-10 15:26:36 +02:00
Jenkins for ownCloud
0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Morris Jobke
f67a691215 Merge pull request #18895 from owncloud/make-code-analyzers-happier
Add proper PHPDoc
2015-09-09 23:40:30 +02:00
Lukas Reschke
46a328a75a Merge pull request #18873 from owncloud/enc_use_master_password
Allow admin to use a master key for all files
2015-09-09 17:05:53 +02:00
Jenkins for ownCloud
bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Bjoern Schiessle
b2e6d7b5f4 occ command to enable master key 2015-09-08 14:58:42 +02:00
Lukas Reschke
a7f132a964 Add proper PHPDoc
Makes my IDE happier when going through that file.
2015-09-08 14:02:30 +02:00
Joas Schilling
38001d824b Move interfaces to private until they are no longer experimental 2015-09-08 09:01:02 +02:00
Joas Schilling
805f1d0096 Scrap the notifications when the share is accepted or declined 2015-09-08 09:01:01 +02:00
Joas Schilling
d191a0dacc Add notifications for remote shares 2015-09-08 09:01:01 +02:00
Jenkins for ownCloud
d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04:00
Morris Jobke
f3e6e0121d Merge pull request #18876 from owncloud/missing-context-on-update-file-target
Use context function call instead of static
2015-09-07 16:41:41 +02:00
Bjoern Schiessle
acfc7d7c4d enable usage of a master key 2015-09-07 16:08:41 +02:00
Joas Schilling
7af7fdd929 Use context function call instead of static 2015-09-07 14:28:20 +02:00
Jan-Christoph Borchardt
004de1425e Merge pull request #18630 from owncloud/files-combineuploadbutton
Combine upload action into the "New" menu
2015-09-07 14:03:57 +02:00
Morris Jobke
4251dcecca Remove unneeded include
* fixes #18867
* ref #18748
2015-09-07 10:33:23 +02:00
Jenkins for ownCloud
53a0009e7b [tx-robot] updated from transifex 2015-09-07 01:55:04 -04:00
Morris Jobke
f2ca0f6677 Merge pull request #18748 from owncloud/files-versions-tab
Add versions tab to files sidebar
2015-09-07 00:53:57 +02:00
Roeland Douma
24f5f50b20 Merge pull request #18742 from owncloud/mimetype-updatedb
Introduce mimetype DB update occ command
2015-09-06 16:56:35 +02:00
Jenkins for ownCloud
3642fb701a [tx-robot] updated from transifex 2015-09-06 01:54:56 -04:00
Jenkins for ownCloud
f3b8634058 [tx-robot] updated from transifex 2015-09-05 01:55:18 -04:00
Robin McCorkell
cdf01f0419 Split mimetype handling to new class 2015-09-04 17:28:20 +01:00
Morris Jobke
e1a79cd651 Avoid re-propagation of shares during one propagation run
* fix was proposed by @nickvergessen
2015-09-04 16:17:27 +02:00
Morris Jobke
c9457fdcad Merge pull request #18762 from owncloud/use-json-instead-of-unserialize
Use "json_encode" and "json_decode" instead of unserialize
2015-09-04 11:40:01 +02:00
Jenkins for ownCloud
4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00
Robin McCorkell
cacbae9d55 Merge pull request #18815 from owncloud/ext-update
Set default mount options for external storages
2015-09-03 16:05:19 +01:00
Vincent Petry
310d797284 Add versions tab to files sidebar
- move versions to a tab in the files sidebar
- added mechanism to auto-update the row in the FileList whenever values
  are set to the FileInfoModel given to the sidebar
- updated tags/favorite action to make use of that new mechanism
2015-09-03 16:47:24 +02:00
Robin McCorkell
f1e97433f7 Set default mount options for external storages 2015-09-03 14:57:14 +01:00
Vincent Petry
1f9974894d Merge pull request #18810 from owncloud/shared-mount-delay-setup
Delay setting up the filesystem for a share owner untill the share is used
2015-09-03 15:09:57 +02:00
Morris Jobke
2b9c34d756 Merge pull request #18781 from owncloud/move-background-job-registration-to-install-update
Move background job registration to install update
2015-09-03 14:55:07 +02:00
Robin Appelman
fd7b210654 Delay setting up the filesystem for a share owner untill the share is used 2015-09-03 13:46:08 +02:00
Vincent Petry
73c61941e2 Tags in FileInfo map must be an array
Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
2015-09-03 13:01:14 +02:00
Vincent Petry
4ba2333507 Added unit tests for "new" file menu and small fixes
- added unit tests for NewFileMenu
- use generateUrl for FileList.createFile and FileList.createDirectory
- added unit tests for FileList.createFile and FileList.createDirectory
2015-09-03 12:17:35 +02:00
Lukas Reschke
ac7d2efbe3 Collapse HTML code for federated code 2015-09-03 11:57:48 +02:00
Vincent Petry
d4104ed9f7 Remove ellipsis on new file menu items 2015-09-03 10:57:34 +02:00