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

9296 commits

Author SHA1 Message Date
Lukas Reschke
5eaa2214b8 Remove conditional check for 5.3 compatibility 2014-12-12 12:25:59 +01:00
Gadzy
ba3957fb8a Check for share by link enabled 
Display "Shared by link" section only if sharing by link is enabled.
 2014-12-12 10:23:51 +01:00
Morris Jobke
e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files 
Handle readonly shared files
 2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Jörn Friedrich Dreyer
c615b3527f show readonly message in file conflict dialog, make it always selected 2014-12-11 16:32:27 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Thomas Müller
80ae311329 Merge pull request #11892 from owncloud/remove_triggerupdate 
Remove triggerupdate.php & add quiet option for CLI scanner
 2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
0f17486c1d make path absolute 2014-12-10 11:04:17 +01:00
Morris Jobke
e3de51078d Merge pull request #12090 from AdamWill/google-rename-delete 
google: delete original after successful rename
 2014-12-10 09:10:17 +01:00
Morris Jobke
3026cdbc80 Merge pull request #12549 from owncloud/shared-cache-non-existing 
Dont return cached date in shared cache when the file doesn't exist
 2014-12-10 08:49:40 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Morris Jobke
bfcd5a3802 Merge pull request #11214 from owncloud/issue/10836 
Add an option to disallow sending sharing emails to non-owncloud users
 2014-12-09 14:05:52 +01:00
Joas Schilling
26861a98c5 Merge pull request #12568 from owncloud/autoload-encryption-classes 
Fix namespaces of encryption classes and encryption tests
 2014-12-09 12:56:57 +01:00
Joas Schilling
539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users 
Fix #10836
 2014-12-09 11:32:39 +01:00
Thomas Müller
9ca8b864e2 Merge pull request #12708 from owncloud/l10nsaved 
translated saved message in files external
 2014-12-09 10:46:35 +01:00
Lukas Reschke
17f85ec5a9 Merge pull request #12688 from owncloud/rename-alt 
introduce alt text for rename icon - fixes #12067
 2014-12-09 10:37:33 +01:00
Lukas Reschke
3566edbcec Merge pull request #12715 from owncloud/fix-broken-personal-page 
remove duplicate loaded personal.js - fixes #12674
 2014-12-09 10:35:08 +01:00
Morris Jobke
4d2573bff7 Merge pull request #12709 from owncloud/fix-11955 
Skip headers that can not be split
 2014-12-09 09:52:59 +01:00
Joas Schilling
b85e34c1da Correctly namespace encryption tests 2014-12-09 09:47:27 +01:00
Joas Schilling
e67fe0336b Use self:: instead of the class name in encryption tests 2014-12-09 09:47:27 +01:00
Joas Schilling
efac8ced90 Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself 2014-12-09 09:47:26 +01:00
Joas Schilling
78a307995c Fix namespace of Files_Encryption outside of the app 2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f Fix namespace of files_encryption classes and autoload them 2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd Merge pull request #12406 from owncloud/drop-getApps-getUsers 
Config cleanup - OC_Preferences refactoring
 2014-12-09 09:36:38 +01:00
Morris Jobke
b9fab7441c remove duplicate loaded personal.js - fixes #12674 2014-12-09 09:27:10 +01:00
Jenkins for ownCloud
8f8f9deb66 [tx-robot] updated from transifex 2014-12-09 01:56:38 -05:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api 
Add a public api for apps to add mounts
 2014-12-08 22:57:33 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage 
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
 2014-12-08 22:42:37 +01:00
Victor Dubiniuk
adc7135429 Skip headers that can not be split 2014-12-08 23:43:43 +03:00
Volkan Gezer
26645c072a translated saved message in files external 2014-12-08 21:40:15 +01:00
Lukas Reschke
de3ead5ab9 Merge pull request #12704 from owncloud/fix-12647-2 
preserve an asterisk at the start when escaping a search term
 2014-12-08 19:14:59 +01:00
Arthur Schiwon
0577bb569a add doc 2014-12-08 17:22:52 +01:00
Arthur Schiwon
45443ee28c preserve an asterisk at the start when escaping a search term 2014-12-08 17:19:57 +01:00
Robin Appelman
baf5c44bec Merge pull request #12696 from owncloud/trashbin-selected-delete 
Fix deleting selected files in the trashbin
 2014-12-08 16:30:53 +01:00
Morris Jobke
1bfa405a93 introduce alt text for rename icon - fixes #12067 2014-12-08 15:49:09 +01:00
Robin Appelman
b2d4e53f66 Fix deleting selected files in the trashbin 2014-12-08 15:16:15 +01:00
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs 
OCS API for server-to-server sharing
 2014-12-08 14:12:03 +01:00
Lukas Reschke
d3188159d2 Merge pull request #12394 from owncloud/files-fileactionsimprovements 
Improve FileActions JS to allow for custom rendering
 2014-12-08 11:30:21 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Thomas Müller
d571f42860 Merge pull request #12668 from owncloud/keepspace 
Keep spaces out of the string
 2014-12-07 13:15:37 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Volkan Gezer
57452a3641 Keep spaces out of the string 
Otherwise translators cannot notice them on Transifex.
 2014-12-07 01:57:34 +01:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Lukas Reschke
1be5a3ca89 Merge pull request #12166 from helmutschneider/aws-2.7.5 
Upgrade AWS sdk to 2.7.5. Fixes #12023
 2014-12-05 20:12:53 +01:00
Lukas Reschke
116a1b366a Merge pull request #11485 from brumsoel/master 
Fix timestamp comparator return value
 2014-12-05 19:53:09 +01:00
Vincent Petry
89db2a0277 Merge pull request #12523 from owncloud/port-11747 
Only store user credentials when SMB_OC storage is enabled
 2014-12-05 18:04:06 +01:00
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Arthur Schiwon
1c369093e5 cache total user count 
Conflicts:
	apps/user_ldap/user_ldap.php
 2014-12-04 19:09:13 +01:00
Arthur Schiwon
ee168a121d Forward port of #12493 
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
 2014-12-04 19:02:09 +01:00
Robin Appelman
a369d78124 Use the mount config api for files_external 2014-12-04 16:47:30 +01:00