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