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

3912 commits

Author SHA1 Message Date
Thomas Müller
d748368ecb Don't highly discourage 2015-02-05 17:21:10 +01:00
Bernhard Posselt
7a9d428d6f Merge pull request #13907 from owncloud/enhance-sqlite-warning 
enhance sqlite warning on admin page as well as during setup
 2015-02-05 13:07:56 +01:00
Jenkins for ownCloud
9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Sebastian Bolt
7ffd2557ff changed image to classed div for spinner animation 2015-02-04 22:27:38 +01:00
Thomas Müller
f86c73c9f6 enhance sqlite warning on admin page as well as during setup - fixes #13906 2015-02-04 20:55:54 +01:00
Lukas Reschke
b432ea29c9 Add rel="noreferrer" where possible and switch to HTTPS 
Just to follow good practise and prevent some automated scanners to complain about "Cross-domain Referer leakage".
 2015-02-04 16:25:37 +01:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Thomas Müller
23c6a0cf99 Merge pull request #13843 from owncloud/fix-files-disabled 
Fix disabled files app
 2015-02-03 16:13:15 +01:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Morris Jobke
a7eedf0149 Disallow disabling of files app 2015-02-03 00:39:01 +01:00
Lukas Reschke
ba29ea178f Add unit tests for empty token 2015-02-01 17:34:03 +01:00
Lukas Reschke
35afb0d22e Default to null for lostpassword 
We oC 8 we use the `StringUtils::equals` method which will also verify the type, since we don't anylonger hash the token twice this is required in case somebody is able to invoke this route with an empty `$token`.
 2015-02-01 17:07:10 +01:00
Jenkins for ownCloud
a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Thomas Müller
ccc1f09627 generate valid human readable text for 0 - fixed #9342 2015-01-29 17:27:28 +01:00
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Morris Jobke
5b4fd12b5b add CSS to exception page - fixes #13747 2015-01-29 20:18:08 +01: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
Lode Hoste
96f81961ed Allow application-specific favicons 2015-01-18 00:19:33 +01: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
Morris Jobke
698e47a7af bower update for jquery.strengthify 0.4.1 2015-01-06 14:46:15 +01:00
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
Jörn Friedrich Dreyer
9e3f4e043f make OCA.Search.Files available in tests and for other apps 2015-01-02 10:57:25 +01:00
Jörn Friedrich Dreyer
606f802b7b move search results below filelist, show hint when results are off screen, use js plugin mechanism 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
c738359a11 add paged provider 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
088323aad5 move code from js.js to search.js in the search app 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
d3662722f6 new OC.Search, add search result formatters and handlers, use full content width for results 2015-01-02 10:28:41 +01:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
01374ab6b5 [tx-robot] updated from transifex 2014-12-30 01:54:26 -05:00
Jenkins for ownCloud
c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Jenkins for ownCloud
1785ca484b [tx-robot] updated from transifex 2014-12-28 01:54:26 -05:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Jenkins for ownCloud
801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00
Morris Jobke
95374e1404 add default for dbtableprefix 2014-12-23 13:32:25 +01:00
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Jan-Christoph Borchardt
6933ffbf83 remove skip to content for now, see #12999 2014-12-22 16:02:45 +01:00
Morris Jobke
dbc465de97 use injected config object and fix typos 2014-12-22 10:55:52 +01:00
tbelau666
ad8d55c327 Use Doctrines filter by table name 
Doctrine's SchemaManager can filter table names by regular expression.
On this way it picks up only ownClouds's tables in a database.

by tbelau666
 2014-12-22 10:45:32 +01:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Jenkins for ownCloud
312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Morris Jobke
79c9fc98a6 Merge pull request #12974 from owncloud/documents-typeface 
change Documents default typeface from serif to sans-serif
 2014-12-20 12:00:27 +01:00
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
Arthur Schiwon
4fa39250e7 LDAP User Cleanup: Port from stable7 without further adjustements 
LDAP User Cleanup

background job for user clean up

adjust user backend for clean up

register background job

remove dead code

dependency injection

make Helper non-static for proper testing

check whether it is OK to run clean up job. Do not forget to pass arguments.

use correct method to get the config from server

methods can be private, proper indirect testing is given

no automatic user deletion

make limit readable for test purposes

make method less complex

add first tests

let preferences accept limit and offset for getUsersForValue

DI via constructor does not work for background jobs

after detecting, now we have retrieving deleted users and their details

we need this method to be public for now

finalize export method, add missing getter

clean up namespaces and get rid of unnecessary files

helper is not static anymore

cleanup according to scrutinizer

add cli tool to show deleted users

uses are necessary after recent namespace change

also remove user from mappings table on deletion

add occ command to delete users

fix use statement

improve output

big fixes / improvements

PHP doc

return true in userExists early for cleaning up deleted users

bump version

control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default.

improve doc

rename cli method to be consistent with  others

introduce ldapUserCleanupInterval in sample config

don't show last login as unix epoche start when no  login happend

less log output

consistent namespace for OfflineUser

rename GarbageCollector to DeletedUsersIndex and move it to user subdir

fix unit tests

add tests for deleteUser

more test adjustements

Conflicts:
	apps/user_ldap/ajax/clearMappings.php
	apps/user_ldap/appinfo/app.php
	apps/user_ldap/lib/access.php
	apps/user_ldap/lib/helper.php
	apps/user_ldap/tests/helper.php
	core/register_command.php
	lib/private/preferences.php
	lib/private/user.php

add ldap:check-user to check user existance on the fly

Conflicts:
	apps/user_ldap/lib/helper.php

forgotten file

PHPdoc fixes, no code change

and don't forget to adjust tests
 2014-12-19 19:47:54 +01:00
Jan-Christoph Borchardt
f512dbb98a change Documents default typeface from serif to sans-serif 2014-12-19 18:16:46 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01:00
Thomas Müller
b32dc3f2a4 Merge pull request #12906 from owncloud/keyboardnav-feedback 
Accessibility: Keyboard navigation feedback
 2014-12-19 09:54:28 +01:00
Jörn Friedrich Dreyer
587bdd9a74 Merge pull request #12948 from owncloud/wording 
Wording fixes for sharing dialog
 2014-12-19 09:48:19 +01:00
Jenkins for ownCloud
028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Jan-Christoph Borchardt
5a678a6350 proper feedback for breadcrumbs when tabbing with keyboard 2014-12-19 00:35:25 +01:00
Jan-Christoph Borchardt
30db964b25 improve keyboard navigation feedback for certain buttons 2014-12-19 00:35:25 +01:00
Jan-Christoph Borchardt
a2c2775df2 introduce first 'Skip to content' button 2014-12-19 00:35:24 +01:00
Jan-Christoph Borchardt
e7686a25e4 fix feedback for apps menu when using keyboard 2014-12-19 00:34:05 +01:00
Jan-Christoph Borchardt
14acf7f254 fix feedback for app navigation when using keyboard 2014-12-19 00:34:05 +01:00
Morris Jobke
3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance 
Wave accessibility compliance
 2014-12-19 00:30:56 +01:00
Jörn Friedrich Dreyer
891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css 
make sure styles and scripts are only loaded once
 2014-12-18 23:18:37 +01:00
Jan-Christoph Borchardt
4f616a481c change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438 2014-12-18 22:39:32 +01:00
Jan-Christoph Borchardt
5aae796d3d change 'update' to more understandable 'change', fix #10408 2014-12-18 22:35:34 +01:00
Jan-Christoph Borchardt
96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt
bfee3eefbd better color contrast for focused buttons 2014-12-18 16:00:26 +01:00
Jan-Christoph Borchardt
7e5fbde4cd add missing input labels for Share dialog 2014-12-18 15:37:46 +01:00
Jan-Christoph Borchardt
2e6235456a fix searchbox label 2014-12-18 13:39:56 +01:00
Jan-Christoph Borchardt
ea548cdaaa fix accessibility of logos 2014-12-18 10:51:41 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Thomas Müller
82f8726903 Merge pull request #12900 from owncloud/more-accessibility 
More accessibility fixes for Files
 2014-12-18 01:21:01 +01:00
Jan-Christoph Borchardt
0bda42b8e3 add empty state for external storages 2014-12-17 21:57:31 +01:00
Jan-Christoph Borchardt
e3192bfa26 use empty state for 'Shared with you' as well 2014-12-17 21:13:53 +01:00
Jan-Christoph Borchardt
2be66044cc even better empty state for Favorites, and general Empty State style 2014-12-17 20:59:26 +01:00
Jan-Christoph Borchardt
0c764bc39f add label for search field for screen readers 2014-12-17 14:49:13 +01:00
Jan-Christoph Borchardt
6f4ed59883 use method to only visually hide elements, show only for screen reader 2014-12-17 14:12:13 +01:00
Jan-Christoph Borchardt
4eecb98b38 add empty alt text for user image 2014-12-17 11:52:45 +01:00
Jenkins for ownCloud
6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Thomas Müller
51a22431ee load showpassord.js conditionally in the template only if needed 2014-12-16 18:45:37 +01:00
Thomas Müller
3cc33a98a8 use script instead of \OCP\Util methods 2014-12-16 18:45:13 +01:00
Jenkins for ownCloud
5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303 Merge pull request #12360 from owncloud/files-tags 
Add favorites to files app
 2014-12-15 19:55:18 +01:00
Jörn Friedrich Dreyer
6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search 
introduce inApps[] filter for search via ajax query
 2014-12-15 16:14:40 +01:00
Vincent Petry
20c30ac79a Load handlebars in core 2014-12-15 12:43:05 +01:00
Vincent Petry
a5bb66f4a7 Added favorites feature to the files app 2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6 Merge pull request #11991 from owncloud/bower-jquery-ui 
bower jquery-ui - exported changes to a separate css file
 2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke
29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges 
Move file thumbnail element into the label tag
 2014-12-13 09:00:43 +01:00
Jenkins for ownCloud
416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Robin Appelman
3bf0922b13 Merge pull request #12527 from owncloud/js-pluginsystem 
Simple Plugin system for Javascript
 2014-12-12 11:43:31 +01:00
Jenkins for ownCloud
527dd8cdf4 [tx-robot] updated from transifex 2014-12-12 04:19:09 -05: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
Vincent Petry
81e9d43e23 Move file thumbnail into the label element 2014-12-11 18:21:25 +01: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
Morris Jobke
8fd90e04b6 Merge pull request #12781 from owncloud/jenkins-curl-open-basedir 
[Jenkins only] curl open basedir
 2014-12-11 14:15:24 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Lukas Reschke
9ea205dc3d Check if open_basedir is set 
The file:// protocol does not work with curl when an open_basedir is set.

This fixes https://github.com/owncloud/core/issues/12016
 2014-12-11 00:09:55 +01:00
Jörn Friedrich Dreyer
1d490b559c introduce inApps[] filter for search via ajax query, make file results show up in files app only 
use more flexible return type

check array with !empty instead of count
 2014-12-10 15:51:59 +01:00
Jan-Christoph Borchardt
880e653aef improve update error page: adjust line height of h2 2014-12-10 13:39:30 +01:00
Jan-Christoph Borchardt
5c36b0bf5d improve update error page: remove box, make link visible, insert missing space, remove line break 2014-12-10 13:30:28 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Thomas Müller
7028c7150d Merge pull request #12664 from owncloud/fix-12164 
Use httphelper and cache response even when it is empty
 2014-12-10 05:42:08 +01:00
Victor Dubiniuk
c9fd3c9d29 Inject config 2014-12-10 01:13:38 +03: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
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
e61f24f2aa Merge pull request #12651 from owncloud/add-requesttoken-to-base-template 
Add requesttoken to base template
 2014-12-09 11:03:46 +01:00
Victor Dubiniuk
303fce44f4 Use httphelper and cache response even when it empty 2014-12-06 20:17:47 +03:00
Lukas Reschke
2b76227180 Check for working .htaccess via AJAX 
Fixes https://github.com/owncloud/core/issues/12650
 2014-12-06 15:34:53 +01:00
Lukas Reschke
be19e78e69 Add requesttoken to base template 
Potentially fixes https://github.com/owncloud/core/issues/12580
 2014-12-05 22:23:55 +01:00
Morris Jobke
5f66cb3250 Merge pull request #12561 from oparoz/vectoricon 
Improve the bitmap and vector mime icons
 2014-12-05 14:51:03 +01:00
Olivier Paroz
ab3381d386 PNG and SVG have been compressed 2014-12-05 01:47:44 +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
Morris Jobke
c5ee95a49e Merge pull request #12522 from owncloud/bower-jstz 
Bower jstz
 2014-12-04 11:58:46 +01:00
Volkan Gezer
7dcf0b02aa Merge pull request #12563 from owncloud/usermenu-remove-border 
remove border from user menu, adjust to apps menu
 2014-12-03 12:11:21 +01:00
Olivier Paroz
5990293331 Improve the bitmap and vector mime icons 
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
 2014-12-02 21:11:56 +01:00
Vincent Petry
c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Morris Jobke
48f00df08e move jstz to bower management 2014-12-01 10:40:31 +01:00
Morris Jobke
fefeb506b2 include lock files of bower to be able to use "bower install" 2014-12-01 10:30:15 +01:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Jan-Christoph Borchardt
e7ed62b2c8 remove border from user menu, adjust to apps menu 2014-11-28 09:35:50 +01:00
Jenkins for ownCloud
96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Morris Jobke
4ed0a418a0 Merge pull request #12414 from owncloud/delay-autoconfig-kill-2 
autoconfig.php only to be deleted on successful installation
 2014-11-26 11:05:23 +01:00
Jenkins for ownCloud
3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Thomas Müller
b68c07d687 autoconfig.php only to be deleted on successful installation 2014-11-25 11:14:35 +01:00
Thomas Müller
e956bd1094 Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change 
Use `/` as redirect location if webroot is set to an empty value
 2014-11-24 11:09:17 +01:00
Vincent Petry
49ad10cfd0 Merge pull request #12362 from owncloud/add-ocs-header-per-default 
Add OCS API header per default
 2014-11-24 11:09:00 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Lukas Reschke
8c2aeb9b21 Add OCS API header per default 
Relieve @PVince from having to write it all the time ;-)
 2014-11-21 19:54:19 +01:00
Lukas Reschke
0fa8b449b2 Use / as redirect location if webroot is set to an empty value 
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
 2014-11-21 15:38:36 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Morris Jobke
985f8c3f69 Merge pull request #12330 from owncloud/jenkins-eat-that 
drop dependency of some commands on old config object
 2014-11-20 17:11:08 +01:00
Morris Jobke
8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Vincent Petry
10d0883da9 Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs 
Added function to load translations from JS
 2014-11-20 10:53:46 +01:00
Jenkins for ownCloud
fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Vincent Petry
ffe57d89e4 Fix l10n promises 2014-11-19 17:02:17 +01:00
Vincent Petry
1c5933c96c Better use of promise in OC.L10N.load() 2014-11-19 14:49:15 +01:00
Lukas Reschke
1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword 
Warn for password reset when files_encryption is enabled
 2014-11-19 13:05:02 +01:00
Vincent Petry
cd60a27ad6 Remove stray generateUrl 2014-11-19 10:59:38 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Vincent Petry
152da9796b Added function to load translations from JS 
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
 2014-11-18 12:20:01 +01:00
Morris Jobke
345eb62ffa center spinner 2014-11-18 10:25:16 +01:00
Lukas Reschke
9eeea57e3a Show spinner 2014-11-17 17:50:25 +01:00
Morris Jobke
68e77f4659 fix unreadable label in warning box 2014-11-17 17:50:20 +01:00
Lukas Reschke
f530865b3d Hide submit button after password change 
Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
 2014-11-17 17:50:20 +01:00
Bjoern Schiessle
11ab457b72 add password as parameter to the signal so that the encryption can create a new key-pair 2014-11-17 17:50:19 +01:00
Lukas Reschke
357465eac9 Add "postPasswordReset" hook 2014-11-17 17:50:19 +01:00
Lukas Reschke
767b08c669 Use correct route instead 
THX @schiesbn
(I should setup a mail server on my local system...)
 2014-11-17 17:50:19 +01:00