Commit graph

3744 commits

Author SHA1 Message Date
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Joas Schilling
3f8e850dc6 Indicate that the share owner is remote in the filelist 2015-01-27 12:32:32 +01:00
Thomas Müller
5da4071c45 Merge pull request #13621 from owncloud/system-config-multiset
Add a method to set/unset multiple config values with one write
2015-01-26 13:36:22 +01:00
Thomas Müller
9ad9d7bfbb naming fixes while reviewing 2015-01-26 12:59:25 +01:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Joas Schilling
039397bd31 Use setConfigs() instead of calling setConfig() multiple times 2015-01-23 14:52:21 +01:00
Jenkins for ownCloud
bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Morris Jobke
254a1fa12a Merge pull request #13314 from owncloud/login-hook-logout
Return false if the login is canceled in a hook
2015-01-22 23:34:19 +01:00
Robin Appelman
8a9acc5083 Allow custom error messages for the login page 2015-01-22 14:13:02 +01:00
Jenkins for ownCloud
5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Jenkins for ownCloud
b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Morris Jobke
ce47065d8f kill ancient code 2015-01-20 14:14:01 +01:00
Jenkins for ownCloud
2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Jenkins for ownCloud
3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Jenkins for ownCloud
31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Jenkins for ownCloud
60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Lukas Reschke
1b671afa17 Merge pull request #13323 from owncloud/move-search
Move search to core/search
2015-01-15 20:41:57 +01:00
Jenkins for ownCloud
4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Morris Jobke
dc17019536 adjust paths for search 2015-01-14 15:15:39 +01:00
Vincent Petry
99304be4ef Read version and product name from update template
During upgrade, the config settings aren't always available due to
base.php changes. This fix makes the update info page read the product
name and version from the update template, which already had them.
2015-01-14 11:31:42 +01:00
Jenkins for ownCloud
f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Morris Jobke
a836479287 move search folder into core/ 2015-01-13 16:27:05 +01:00
Morris Jobke
dc86cbd1e2 Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master
Use a special filter expression for Oracle to filter the prefix - fixes ...
2015-01-13 10:31:04 +01:00
Jenkins for ownCloud
3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Thomas Müller
1d2bef0a01 Use a special filter expression for Oracle to filter the prefix - fixes #13220 2015-01-12 16:28:11 +01:00
Jenkins for ownCloud
9e550ab844 [tx-robot] updated from transifex 2015-01-12 01:55:52 -05:00
Volkan Gezer
a1d86aab20 32-bit typo fix 2015-01-11 13:36:19 +01:00
Jenkins for ownCloud
3425c73815 [tx-robot] updated from transifex 2015-01-11 01:54:32 -05:00
Jenkins for ownCloud
22e5220c1f [tx-robot] updated from transifex 2015-01-10 01:54:35 -05:00
Morris Jobke
da8228fa14 Merge pull request #13195 from owncloud/resharepermfix
Fix reshare permission issue
2015-01-09 18:05:05 +01:00
Thomas Müller
847dd6d04c Merge pull request #13205 from owncloud/remove-shared-icon
replace outdated 'shared' people icon with regular share icon as fallback
2015-01-09 16:40:26 +01:00
Jan-Christoph Borchardt
c26e669c4c replace outdated 'shared' people icon with regular share icon as fallback 2015-01-09 16:18:42 +01:00
Vincent Petry
c897a14d56 Fix reshare permission issue
The actual share permissions sent to the server on reshare are now based
on possiblePermissions + permissions inherited from parent share
2015-01-09 15:19:53 +01:00
Thomas Müller
1f1643b35f Merge pull request #12995 from owncloud/tbelau666-master
Use Doctrines filter by table name
2015-01-09 14:17:14 +01:00
Lukas Reschke
a5099b01f9 Merge pull request #12984 from owncloud/ldap-user-cleanup-master
Ldap user cleanup master
2015-01-09 10:47:02 +01:00
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Lukas Reschke
6c59253978 Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
Verify whether type is correct
2015-01-09 02:27:51 +01:00
Lukas Reschke
ceaaab6295 Verify whether type is correct
`$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
2015-01-08 18:38:17 +01:00
Morris Jobke
8e1904386f Add timeout for notifications
* options for timeout in seconds and if it contains HTML
* if timeout is 0 it will show the message permanently
* removes the notification after a given (default: 5 seconds) timeframe
* based on work by @brantje
* provide JS unit tests for notifications
2015-01-08 13:06:45 +01:00
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Morris Jobke
bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
Bjoern Schiessle
e9e7ee67d3 shareType and permissions are integers 2015-01-07 16:36:13 +01:00
Morris Jobke
5ce295907f Merge pull request #12687 from owncloud/auto-escape-t-placeholders
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke
bfdf0db7c0 Autoescape of placeholders in t() and p() - for JS
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Arthur Schiwon
ae9c9a46b8 inject and use user manager to delete command instead of using old static oc_user way 2015-01-07 12:21:28 +01:00
Jenkins for ownCloud
2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -05:00
Thomas Müller
a014997ded Merge pull request #13126 from owncloud/update-jquery-strengthify
Update jquery strengthify
2015-01-06 19:47:28 +01:00
Morris Jobke
fe4592937a Merge pull request #12653 from owncloud/full_content_search_results
Full content width search results
2015-01-06 16:44:58 +01:00