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

18169 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
3b1f291c60 Fix sorting of apps 2014-06-03 12:42:35 +02:00
Robin Appelman
7272779456 Prevent js error 2014-06-03 12:42:35 +02:00
Robin Appelman
c09852e006 Fix phpdoc 2014-06-03 12:42:35 +02:00
Robin Appelman
53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Robin Appelman
bf9b634fd8 Trigger change event on multiselect change 2014-06-03 12:42:35 +02:00
Robin Appelman
b4025b3174 Allow enabling apps by group by setting the config value to a json encoded array of groups 2014-06-03 12:42:35 +02:00
Morris Jobke
e8ec81110d Merge pull request #8806 from owncloud/add_share_index 
add share index
 2014-06-02 18:47:13 +02:00
Morris Jobke
390d8e53b4 Merge pull request #8676 from owncloud/encryption_improvements 
cleanup encryption code, improved return codes
 2014-06-02 18:28:18 +02:00
Morris Jobke
dd8b7b7af8 Merge pull request #8613 from owncloud/filesize-alignment 
Improve aligment of file size
 2014-06-02 17:37:53 +02:00
Frank Karlitschek
51602f67e0 Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav 
fully translatable user_webdav
 2014-06-02 15:53:18 +02:00
Morris Jobke
5d457dafc1 display "<1 kB" for really small files 
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
 2014-06-02 15:33:09 +02:00
Morris Jobke
6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings 
make reshare settings foldable
 2014-06-02 14:37:10 +02:00
Bjoern Schiessle
b16b17f920 ceanup encryption code, improved return codes 2014-06-02 13:15:11 +02:00
Arthur Schiwon
f0e69b2b99 Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579 
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs

get the correct version number for compare -.-

bump version and don't overwrite values on next update if not necessary

simpler and better readable assignment
 2014-06-02 12:08:01 +02:00
Vincent Petry
f931df2dac Merge pull request #8718 from owncloud/share_icons_for_shared_by 
add share icons for folders shared by the current user
 2014-06-02 12:03:22 +02:00
Vincent Petry
4e957c7b18 Merge pull request #8443 from owncloud/csrf-on-login-and-logout 
Add CSRF check on login and logout
 2014-06-02 11:27:20 +02:00
Vincent Petry
09ab642d2b Merge pull request #8807 from owncloud/add_filecache_index 
add another index to the filecache to reduce the number of queries witho...
 2014-06-02 11:11:04 +02:00
Morris Jobke
27c8c87e94 Merge pull request #8187 from owncloud/escape-more-character 
Also encode > and '
 2014-06-02 10:59:47 +02:00
Jenkins for ownCloud
d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Bernhard Posselt
89bccf7193 Merge pull request #8811 from owncloud/fix-phpdoc-ap 
Fix PHPDoc
 2014-06-01 22:40:07 +02:00
Lukas Reschke
c8b5ae675c Fix PHPDoc 
- Remove not anymore existing parameters
- Fix typo
 2014-06-01 21:46:05 +02:00
Jenkins for ownCloud
36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Lukas Reschke
603b6c13b4 Fix typo 2014-05-31 21:11:29 +02:00
Vincent Petry
56b60b9cd2 Merge pull request #8798 from owncloud/fix-corejs 
Fix undefined JS on login/setup page
 2014-05-31 17:26:30 +02:00
Frank Karlitschek
a339855b4c add another index to the filecache to reduce the number of queries without a matching index 2014-05-31 16:55:50 +02:00
Frank Karlitschek
e19b3a8794 add share index 2014-05-31 16:47:46 +02:00
Jenkins for ownCloud
cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Thomas Müller
86b06c72bb Merge pull request #8800 from owncloud/db-changes-as-required-by-8483 
Database code cleanup
 2014-05-31 00:47:03 +02:00
Thomas Müller
999f6216dc - fix dropTable() and introduce tableExists() 
- kill replaceDB() - this function is unused and it's implementation obviously wrong
- add method annotation OC_DB_StatementWrapper::fetchAll
- remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists
- remove unused variables
 2014-05-30 23:34:42 +02:00
Thomas Müller
5dd3e34f57 Merge pull request #8444 from owncloud/cleanup-list-code 
Cleanup code of files_sharing/ajax/ a little bit
 2014-05-30 22:40:28 +02:00
Thomas Müller
555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working 
Check if ReflectionMethod::getDocComment is working
 2014-05-30 22:17:30 +02:00
Vincent Petry
a0987ebf59 Fix undefined JS on login/setup page 2014-05-30 19:02:19 +02:00
Owen Winkler
da6aae28ad Merge pull request #8607 from owncloud/filescan_app_hook 
Allow apps to control via a hook skipping add/remove a file during filescan
 2014-05-30 12:38:37 -04:00
Lukas Reschke
b7f163a701 Merge pull request #8695 from owncloud/jserrorfixes 
Fixed undefined object error that appears after a delay
 2014-05-30 17:20:09 +02:00
Vincent Petry
c8a19adc3a Merge pull request #8779 from owncloud/sel-webdav-onclick 
select webdav address on click
 2014-05-30 17:18:54 +02:00
Volkan Gezer
a36f2c93d6 Merge pull request #8793 from owncloud/name-email-enter-prevent 
prevent pageload if pressed enter on name email change. fixes #6179
 2014-05-30 17:03:32 +02:00
ringmaster
19f0c47842 Missed one. 2014-05-30 10:40:26 -04:00
Lukas Reschke
756b158230 Merge pull request #8663 from owncloud/files-dndissue 
Fixed drag and drop from external files, added tests
 2014-05-30 16:28:20 +02:00
Thomas Müller
59b1f4c476 Merge pull request #8781 from owncloud/add-a-warning-to-the-sample 
Add a warning to the configuration file
 2014-05-30 16:17:19 +02:00
Thomas Müller
31ad1cbdd8 Merge pull request #5365 from owncloud/filesize-improvements-32bit 
Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
 2014-05-30 16:13:48 +02:00
Volkan Gezer
bb8ee2e9af fix wording 2014-05-30 16:00:57 +02:00
ringmaster
16ae63bdfd Updates per comments on PR: 
* Use "filesystem_cache_readonly" config setting, update comment in config.sample
* Use $this->cacheActive to cache config setting
* Add public Scanner::setCacheActive() to set $cacheActive programmatically
 2014-05-30 09:42:41 -04:00
Volkan Gezer
d7e63d8fab select webdav address on click 2014-05-30 15:39:25 +02:00
Bjoern Schiessle
717eff22d4 add share icons for folders shared by the current user 2014-05-30 15:14:01 +02:00
Volkan Gezer
4843d13056 prevent pageload if pressed enter on name email change 2014-05-30 15:12:39 +02:00
icewind1991
2ba5701b1a Merge pull request #8778 from owncloud/storage-instanceof 
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
 2014-05-30 14:58:59 +02:00
Lukas Reschke
517501ffbf Merge pull request #8417 from owncloud/share-overview 
Sharing overview page
 2014-05-30 13:42:24 +02:00
Vincent Petry
7fac2b62e9 Fixed warning when file_target is not set 
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
 2014-05-30 12:35:04 +02:00
Vincent Petry
5e4e773446 Removed "Share with" column 2014-05-30 10:06:30 +02:00
Vincent Petry
66afd1aa39 Fix fileList fallback in OC.Share for outside files app 
OC.Share can be used in non-files apps, so the fileList callback needs
to support that as well.
 2014-05-30 10:06:30 +02:00