Andreas Fischer
f9853b253c
Deduplicate connection handling code into \OC\DB\ConnectionFactory
2014-03-31 20:09:07 +02:00
Andreas Fischer
a585cec530
Remove unnecessary and incorrect comments.
2014-03-31 19:27:18 +02:00
Andreas Fischer
e67cf99cef
\InvalidArgumentException is in root namespace.
2014-03-31 18:20:24 +02:00
Andreas Fischer
5dbbe6d08b
Doc blocks for properties do not repeat the property name.
2014-03-31 18:20:04 +02:00
Thomas Müller
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
Andreas Fischer
b002f11771
Use question color.
2014-03-31 17:06:06 +02:00
Andreas Fischer
e768ead820
Remove whitespace at end of lines.
2014-03-31 17:06:02 +02:00
Morris Jobke
ab696edba6
Merge pull request #7916 from owncloud/fix-input-sizes
...
Fix input sizes
2014-03-31 15:56:19 +02:00
Andreas Fischer
2d69c4c2d3
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (663 commits)
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Sub-dir was prepended twice
Sub-dir was prepended twice
[tx-robot] updated from transifex
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Emit event after setting a new expiration for a share
adding @method annotation to declare methods which can be called on the wrapped statement object
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
don't write file if opening a stream to encrypt the data fails
Do not retrieve storage stats for trash bin
[tx-robot] updated from transifex
prevent dimmed ocdialog div from scrolling
fix breadcrumbs for IE8
enable SVG->PNG fallback for 'New' menu
enable SVG->PNG fallback for newly uploaded files and folders
specify logo to not repeat when container is bigger
fix SVG replacement for logo so it works in IE8, fix #7866
Fix swift touch operation
[tx-robot] updated from transifex
...
Conflicts:
3rdparty
2014-03-31 15:33:01 +02:00
Morris Jobke
8bd308ffed
merge CSS rules
2014-03-31 13:51:53 +02:00
Jan-Christoph Borchardt
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt
615de6534f
fix duplicate rules for button/input styles, em to px
2014-03-31 12:27:26 +02:00
raghunayyar
881c66df52
Removes highlighting of selected items, padding from apps management.
2014-03-30 15:48:47 +05:30
Jenkins for ownCloud
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
Rodrigo Hjort
51b727cfca
Correction: failure on sharing when user ID was prefixed by zero
2014-03-28 15:08:59 -03:00
Morris Jobke
841069e8cb
Merge pull request #7770 from jamesryanbell/master
...
SVG support detection
2014-03-28 15:14:12 +01:00
Vincent Petry
0436453353
Merge pull request #7720 from ideaship/autoconfig_fix
...
fix autoconfig
2014-03-28 10:41:46 +01:00
Thomas Müller
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
Thomas Müller
e3b951f412
Merge pull request #7724 from owncloud/mobile
...
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
Jenkins for ownCloud
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
Jörn Friedrich Dreyer
2561107b4e
prevent dimmed ocdialog div from scrolling
2014-03-28 02:43:33 +01:00
Jan-Christoph Borchardt
ec46a07195
convert input metrics to px
2014-03-27 17:13:36 +01:00
Jan-Christoph Borchardt
5b2abb32a6
remove CSS rules for personalblock, remove it from core
2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
bf77c580c1
general styles for the content area
2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
ba82175e11
specify logo to not repeat when container is bigger
2014-03-27 14:37:41 +01:00
Jan-Christoph Borchardt
d2de6e7a66
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-27 14:31:24 +01:00
Jenkins for ownCloud
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
Thomas Müller
a54260b517
use minimum-scale=1.0
2014-03-25 23:35:55 +01:00
Thomas Müller
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
Thomas Müller
4900ad9119
update type hint in PHPDoc
2014-03-25 22:59:42 +01:00
VicDeo
86356db044
Merge pull request #7772 from owncloud/filter_more_jsconsole
...
Also replace console.time/timeEnd when not in DEBUG mode
2014-03-25 20:29:26 +02:00
Thomas Müller
f9279ac77a
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
2014-03-25 17:42:41 +01:00
Thomas Tanghus
0b4d879619
Fix copy/paste error :P
2014-03-25 15:38:11 +01:00
Thomas Tanghus
aa5bba2bcc
'ID' => 'id' and check existence of EMAIL
2014-03-25 14:22:39 +01:00
Jenkins for ownCloud
b92dad992f
[tx-robot] updated from transifex
2014-03-25 01:55:34 -04:00
raghunayyar
3d8ce8104f
Adds Style changes to app-navigation in core/css/apps.css
2014-03-24 17:59:53 +05:30
Jenkins for ownCloud
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
Jenkins for ownCloud
4a19a97d67
[tx-robot] updated from transifex
2014-03-23 01:55:34 -04:00
Jenkins for ownCloud
0245e64cec
[tx-robot] updated from transifex
2014-03-22 01:56:09 -04:00
Jan-Christoph Borchardt
89ee551158
mobile: adjust breakpoint in JS as well
2014-03-21 16:43:04 +01:00
Jan-Christoph Borchardt
9b9b6ec31e
mobile: set a width for navigation popover to it's always 3 columns
2014-03-21 16:40:39 +01:00
Jan-Christoph Borchardt
f2566e649f
mobile: adjust break to 768, also fix min-widths
2014-03-21 16:36:45 +01:00
Morris Jobke
43313d120d
Merge pull request #7820 from owncloud/core-macwarning
...
Added warning for Mac OS on setup page
2014-03-21 15:06:11 +01:00
Jan-Christoph Borchardt
ecf52e05fb
mobile: adjust width of app title, fix overlap
2014-03-21 14:30:11 +01:00
Thomas Müller
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
Jörn Friedrich Dreyer
c9d97d2ef2
add top:45px to position:fixed controls, fixes alignment on android 4.0.4 browser
2014-03-21 11:56:47 +01:00
Jenkins for ownCloud
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
Vincent Petry
6de9033d86
Added warning for Mac OS on setup page
2014-03-20 12:57:55 +01:00
Jenkins for ownCloud
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
jbtbnl
57cfff7d51
Fix #7758
2014-03-19 16:45:10 +01:00
Vincent Petry
6252c248c2
Merge pull request #7557 from owncloud/issue/7297
...
Do not allow setting an expiration date in the past
2014-03-19 15:53:08 +01:00
Joas Schilling
7ab2632085
Use tipsy to display error when selecting a date in the past
2014-03-19 12:11:14 +01:00
Thomas Müller
33e96597d1
Merge pull request #7790 from owncloud/fix/7788
...
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Jenkins for ownCloud
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
Thomas Tanghus
13f1f105c8
Set overflow-y to auto
2014-03-18 18:25:30 +01:00
Jan-Christoph Borchardt
59906fbb4d
mobile: show caret indicator next to logo to make clear it is tappable
2014-03-18 17:48:28 +01:00
Thomas Müller
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
Vincent Petry
67b8cfedf9
Define _matchMedia wrapper earlier
...
The unit test stub didn't work because the _matchMedia wrapper
was defined too late.
This fix defines it earlier.
2014-03-18 16:02:13 +01:00
Vincent Petry
cc6c152984
Fixed matchMedia usage to make unit tests work in PhantomJS
...
PhantomJS has a bug that makes it impossible to properly stub
window.matchMedia. This fix adds a wrapper as OC._matchMedia
that is used for unit tests
2014-03-18 15:52:06 +01:00
Vincent Petry
fe04106e0f
Add/remove main menu action when switching between desktop/mobile mode
2014-03-18 13:10:13 +01:00
Vincent Petry
872006da03
Only enable toggle for sidebar in mobile mode
2014-03-17 20:44:30 +01:00
Thomas Tanghus
413afab424
Replace console.time/timeEnd
2014-03-17 19:39:19 +01:00
jamesryanbell
4fc96ebb7b
SVG support detection
...
The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
2014-03-17 16:11:49 +00:00
icewind1991
4112d63a40
Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
...
Added warning for trusted_domains after CLI upgrade
2014-03-17 13:21:54 +01:00
Jenkins for ownCloud
518903c6eb
[tx-robot] updated from transifex
2014-03-17 01:56:06 -04:00
Jenkins for ownCloud
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
Vincent Petry
1a116828cf
Added warning for trusted_domains after CLI upgrade
...
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
2014-03-14 11:16:45 +01:00
Jan-Christoph Borchardt
74eb9bea22
add 'body-public' ID to body in base layout so it can be identified via CSS
2014-03-14 11:08:16 +01:00
Jan-Christoph Borchardt
ac48563efd
add spans around replaced 'Shared' indicators to make text hide on mobile
2014-03-14 10:48:28 +01:00
Jan-Christoph Borchardt
b37aae9925
mobile: menu togglable for mobile, use code by @PVince81
2014-03-14 10:33:19 +01:00
Jan-Christoph Borchardt
eb7b125254
mobile: position share dropdown
2014-03-14 09:15:20 +01:00
Jan-Christoph Borchardt
84c96c2bf7
mobile: don't require a minimum width for controls bar
2014-03-14 09:14:52 +01:00
Jenkins for ownCloud
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
ideaship
a5425e84f2
fix autoconfig
...
In array_merge, $post overrides $opts (concerns data directory).
Always merge $post before calling display().
Default value for dbtype which may still be undefined in display().
Fixes several problems related to autoconfig:
- installation.php only showed $AUTOCONFIG data if it was called after
install() had come back with errors
- if autoconfig.php was set, installation.php showed an editable field
with the wrong data in it; then, regardless of any changes, the value
from autoconfig.php was used
- installation.php used undefined indeces (dbtype, dbIsSet,
directoryIsSet)
2014-03-13 20:05:11 +01:00
Jenkins for ownCloud
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
Jenkins for ownCloud
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
Vincent Petry
a53df71b4a
Merge pull request #7652 from owncloud/localStorage_remove
...
Add OC.localStorage.removeItem()
2014-03-11 12:40:14 +01:00
Vincent Petry
0e4d522dd9
Merge pull request #7659 from owncloud/fix-7596
...
Fix 7596
2014-03-11 11:36:22 +01:00
Jenkins for ownCloud
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
Thomas Müller
f1ecc758f5
send an individual email to each recipient
2014-03-10 21:54:23 +01:00
Thomas Tanghus
5e6f0dcc6d
Fix copy/paste error
2014-03-10 16:26:07 +01:00
Thomas Tanghus
01bcdf5b53
Add function remove() to OC.localeStorage
2014-03-10 16:22:52 +01:00
Vincent Petry
23eeb898a9
Merge pull request #7600 from ideaship/fix_escaped_html
...
fix: use print_escaped for radio button "checked"
2014-03-10 16:12:39 +01:00
Jan-Christoph Borchardt
9a31e53313
Merge pull request #7567 from owncloud/apps-scroll-settings
...
restrict height of settings and make scrollable
2014-03-09 01:22:51 +01:00
Vincent Petry
536c33895f
Merge pull request #7592 from owncloud/fixstoragefreespace
...
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
ideaship
e08dbf80dc
fix: use print_escaped for radio button "checked"
...
use of p() results in escaped HTML code: checked="checked"
where it should be: checked="checked"
2014-03-06 16:03:00 +01:00
Morris Jobke
256dca935b
Revert "adding new javascript function OC.generateUrl(url, params)"
...
This reverts commit 8e667d1934
.
2014-03-06 15:10:32 +01:00
Morris Jobke
5f0a22586f
Merge pull request #7579 from owncloud/introduce-generateUrl-master
...
Introduce OC.generateUrl() in master
2014-03-06 15:07:28 +01:00
Vincent Petry
6e4ea09d52
Merge pull request #7494 from owncloud/fix-7307
...
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +01:00
Vincent Petry
e129f6845b
Added testArea for JS Unit tests
...
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.
The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
themselves
2014-03-06 12:50:18 +01:00
Jan-Christoph Borchardt
0b0687c9fc
fix noise not repeating
2014-03-06 12:38:11 +01:00
Thomas Müller
b46517f012
adding js unit tests for OC.generateUrl()
2014-03-06 00:26:57 +01:00
Thomas Müller
8e667d1934
adding new javascript function OC.generateUrl(url, params)
2014-03-06 00:17:48 +01:00
Thomas Müller
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
Jan-Christoph Borchardt
36fcb0fb4e
Merge pull request #7569 from owncloud/scrutinizer-tabs
...
fix some spaces to tabs issues reported by Scrutinizer
2014-03-05 18:10:01 +01:00
Morris Jobke
8c1cd2b83e
Merge pull request #7566 from owncloud/button-outlines
...
Adds 0 Outlines to Buttons
2014-03-05 16:50:22 +01:00
Jan-Christoph Borchardt
7ad7f94797
fix some spaces to tabs issues reported by Scrutinizer
2014-03-05 15:47:12 +01:00
Jan-Christoph Borchardt
4a4b32d325
restrict height of settings and make scrollable
2014-03-05 15:08:16 +01:00
raghunayyar
5a9689eb5c
Adds 0 Outlines to Buttons
2014-03-05 19:36:36 +05:30
Jan-Christoph Borchardt
4d679de30b
add hover/focus states for star icons to hint at action
2014-03-05 13:21:33 +01:00
Joas Schilling
80393d9c0f
Do not allow setting an expiration date in the past
...
Fix #7297
2014-03-05 13:12:58 +01:00
Morris Jobke
a8ae2f10b9
Merge pull request #7554 from owncloud/issue/7304
...
Fix position of eye icon on database password field
2014-03-05 11:13:43 +01:00
Vincent Petry
6de370b64c
Removed obsolete OC.Router stubs in specHelper
2014-03-05 10:27:15 +01:00
Joas Schilling
4ee4f0c365
Fix position of eye icon on database password field
...
Fix #7304
2014-03-05 10:22:35 +01:00
Thomas Müller
33b798c3d6
fixing js unit tests
2014-03-05 01:10:39 +01:00
Vincent Petry
25251d4bf7
Fix mail template to use p() for colors
...
Now using p() instead of print_unescaped() for colors.
2014-03-03 17:36:12 +01:00
Frank Karlitschek
7983c90fdc
Merge pull request #7500 from owncloud/theme-mailtemplate
...
Enable theming of the mail template header
2014-03-03 17:22:33 +01:00
jbtbnl
e603164517
Do not override button background image
2014-03-03 14:07:44 +01:00
Jan-Christoph Borchardt
b8d0fc9494
make mail notification header color themable
2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt
eac9eebfdb
compress mail notification logo
2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt
607f205bda
mail template: remove off-white background color to better blend into mail client
2014-03-03 12:21:08 +01:00
Thomas Müller
e1030c6b5f
adding JSDoc + remove unused function
2014-03-02 23:15:37 +01:00
Thomas Müller
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
Raghu Nayyar
e304809612
Merge pull request #7382 from jbtbnl/master
...
Remove necessity of icon class
2014-02-27 21:11:26 +05:30
Morris Jobke
7af846e656
Merge pull request #7452 from owncloud/icon-delete-hover
...
icons: automatically show delete hover instead of using explicit class
2014-02-27 14:44:29 +01:00
Morris Jobke
6fe1cf7ae4
Merge pull request #7449 from owncloud/remove-input-border
...
remove border from log in input fields, simpler and works better with themes
2014-02-27 13:24:44 +01:00
Jan-Christoph Borchardt
58bc6aee51
icons: automatically show delete hover instead of using explicit class
2014-02-27 12:48:25 +01:00
Jan-Christoph Borchardt
af467d92f6
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
2014-02-27 12:24:14 +01:00
Jan-Christoph Borchardt
f0cd08ab5d
remove border from log in input fields, simpler and works better with themes
2014-02-27 12:13:09 +01:00
Joas Schilling
922c1909f8
Translate string when an error occured while sending a forgot password mail
...
Fix #7423
2014-02-26 17:29:47 +01:00
Thomas Müller
2f0db9af07
Merge pull request #7409 from owncloud/issue/5361
...
Add owncloud version to JS scope
2014-02-26 14:44:12 +01:00
Jan-Christoph Borchardt
d9a153dbe9
Merge pull request #7174 from owncloud/issue/7166
...
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Joas Schilling
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
Joas Schilling
cb14b1c58d
Add owncloud version to JS scope
...
Fix #5361
2014-02-26 11:50:52 +01:00
jbtbnl
d28fd8f64d
Remove necessity of icon class
...
Only the icon specific class is needed
2014-02-24 22:37:19 +01:00
Morris Jobke
5fb1374b0f
Merge pull request #7285 from owncloud/mimeicons-svg
...
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
Morris Jobke
8d17f6d675
Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
...
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
icewind1991
ddb8cf32e9
Merge pull request #7344 from owncloud/add-js-config-vars
...
Allow apps to add/modify config js output via hook.
2014-02-24 13:29:54 +01:00
Robin Appelman
7c4f81bd78
rename url parameter
2014-02-24 13:24:10 +01:00
Vincent Petry
80c61d480c
Added oc_defaults stub in specHelper.js
...
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
2014-02-24 09:45:02 +01:00
Morris Jobke
079d64ce75
Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
...
No css js delivery via php
2014-02-21 20:37:10 +01:00
icewind1991
9b9b2255b6
Merge pull request #7355 from owncloud/new-menu-svg
...
Use SVG icons in New file menu
2014-02-21 16:18:43 +01:00
Robin Appelman
df35929ed2
Merge branch 'master' into add-js-config-vars
2014-02-21 16:07:21 +01:00
Robin Appelman
59ec61dc03
Merge branch 'master' into GuillaumeAmat-patch-1
2014-02-21 16:04:31 +01:00
Morris Jobke
a5c70f16d2
Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
...
fix thumbnail generation for subdirectories in the conflicts dialog
2014-02-21 15:33:13 +01:00
icewind1991
aa0bcf7ba4
Merge pull request #7336 from owncloud/IE-wipho-viewport
...
fix viewport size on windows phone
2014-02-21 15:13:20 +01:00
Jan-Christoph Borchardt
877cfb963a
use SVG icons from icons.css for New file menu
2014-02-21 14:07:25 +01:00
Robin Appelman
4715fb12c8
Add url parameter to control whether previews should return 404 when the mimetype is unsupported
2014-02-21 14:06:15 +01:00
Jörn Friedrich Dreyer
d9e333c0da
use directory from original instead of current dir
2014-02-21 14:01:38 +01:00
Thomas Müller
27ad69eea5
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-21 14:01:24 +01:00
Robin Appelman
3f52eb073d
Merge branch 'master' into mimeicons-svg
2014-02-21 14:00:17 +01:00
Robin Appelman
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
Thomas Müller
f19276f7bc
Merge branch 'master' into no-css-js-delivery-via-php
...
Conflicts:
config/config.sample.php
2014-02-21 09:51:51 +01:00
ringmaster
58be2eb955
Allow apps to add/modify config js output via hook.
2014-02-20 18:13:27 -05:00
Lukas Reschke
917a505af4
Merge pull request #7291 from owncloud/adminess-raghu
...
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
Robin Appelman
daf28225b7
fix viewport size on windows phone
2014-02-20 18:42:59 +01:00
Jan-Christoph Borchardt
d5739e83d1
remove additional transition rule, reduce width of collapsed search bar
2014-02-20 18:40:08 +01:00
Robin Appelman
d9bb21146f
fix IE10 viewport sizeing
2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt
d466458469
restrict zooming in to not mangle layout accidentally
2014-02-20 17:37:48 +01:00
Robin Appelman
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
Jan-Christoph Borchardt
bfe6dfe5da
Merge pull request #7056 from owncloud/users-scrollperformance
...
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt
5cc4a47f4c
Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix
...
remove fix for IE9 nav bar width
2014-02-20 16:25:08 +01:00
Lukas Reschke
e4c3ef2ca6
Merge pull request #7289 from owncloud/fix-filetype-icons
...
Fix filetype icons
2014-02-20 14:53:41 +01:00
Vincent Petry
6cf83de60e
Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1
2014-02-20 14:49:54 +01:00
Jörn Friedrich Dreyer
3f6d14be85
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
...
Conflicts:
core/css/styles.css
2014-02-20 14:29:23 +01:00
Thomas Müller
31bab55847
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-20 13:52:53 +01:00
Jan-Christoph Borchardt
20b740f8e4
do not show display name on mobile when profile picture is present
2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt
92d57cb5a7
move avatar into clickable area of user menu
2014-02-20 13:36:52 +01:00
Thomas Müller
ac8e6b15b6
kill references to core.js and core.css
2014-02-20 13:23:24 +01:00
Thomas Müller
bf22ed7bdb
kill old minimizer code
2014-02-20 13:10:56 +01:00
Lukas Reschke
169f4cf7ff
Fix typo
2014-02-20 12:51:15 +01:00
Björn Schießle
16eb43c033
Merge pull request #7247 from owncloud/sharing_cleanup_step1
...
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
Jan-Christoph Borchardt
3e2c56157b
reduce width of searchbox on mobile, fix overlap, fix #7282
2014-02-20 11:33:46 +01:00
Lukas Reschke
65c0b73c87
Merge pull request #7255 from owncloud/fix-admin-remote
...
An admin should not be able to add remote and public services on its own
2014-02-20 11:16:43 +01:00
Jan-Christoph Borchardt
3e235b2699
merge master
2014-02-20 10:51:13 +01:00
Thomas Müller
3ce77a35e5
fixing js syntax error
2014-02-20 10:42:54 +01:00
Lukas Reschke
ba7a79372a
Variable value is expected and not an echoed output
2014-02-20 10:28:11 +01:00
Lukas Reschke
b61f0f11c5
Move oc_isadmin to the config JS script
2014-02-20 10:26:05 +01:00
kondou
90f351afa2
Optimize some images
...
and strip metadata from png images with optipng in image_optimization.sh
2014-02-19 21:31:50 +01:00
Bjoern Schiessle
2fd75d8f1c
clean up the sharing ajax calls, add mail notification class
2014-02-19 19:33:00 +01:00
Lukas Reschke
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
kondou
16cbfd0383
Optimize images
2014-02-19 16:44:08 +01:00
Jan-Christoph Borchardt
937a25593b
fix lots of file type icons for archives, js, flash, ics, fonts, code, ...
2014-02-19 16:27:38 +01:00
Robin Appelman
609a91a9b1
Show svg mime icons when no preview is available
2014-02-19 14:47:29 +01:00
Joas Schilling
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller
1e321406ee
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
...
polish documentation based on scrutinizer patches
2014-02-19 07:04:37 +01:00
Thomas Müller
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Tom Needham
635b8f6b83
Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect
...
do not autocapitalize fields on mobile, fix user name input
2014-02-18 18:26:56 +01:00
Lukas Reschke
c19cacb29f
Check whether the app is set
2014-02-18 14:12:49 +01:00
Lukas Reschke
1352c63dca
Check whether the Key is set
2014-02-18 12:47:05 +01:00
Lukas Reschke
dc6f1d875d
An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
...
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
2014-02-18 12:32:57 +01:00
Jan-Christoph Borchardt
dafa8fc37e
do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete
2014-02-18 10:58:00 +01:00
Thomas Müller
92560c5b86
Merge pull request #7243 from owncloud/core-sessionlifetimedefault
...
Now using PHP session lifetime as default value for the JS config
2014-02-18 10:30:25 +01:00
Vincent Petry
f9763e1fc5
Now using PHP session lifetime as default value for the JS config
...
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
2014-02-17 21:33:04 +01:00
Jan-Christoph Borchardt
0f434038a7
add cbr/cbz file type icon, fix #6953
2014-02-17 20:48:32 +01:00
Vincent Petry
c732764eb5
Improve users list scrolling performance
...
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
the server side)
2014-02-17 19:32:45 +01:00
Bart Visscher
8a6dcdf4a4
Move password interaction to interact function
2014-02-17 18:09:42 +01:00
Bart Visscher
bcb78e48b2
Split execute function into multiple functions
2014-02-17 18:02:58 +01:00
Jan-Christoph Borchardt
84cd6e035e
Merge pull request #7132 from owncloud/issue/6920
...
Do not select input for all text input fields
2014-02-17 15:01:03 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Vincent Petry
d7f4547717
Merge pull request #6726 from owncloud/fix_6630
...
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00
Guillaume AMAT
01dee35ebe
Adds OC_Defaults values in javascript config
2014-02-13 10:47:03 +01:00
Bart Visscher
ae525d1f12
Fix namespace for Exception
2014-02-12 17:42:55 +01:00
Bart Visscher
3abcd13979
Allow converting from any db type
2014-02-11 18:01:41 +01:00
Bart Visscher
eede20c5ac
Check target DB type
2014-02-11 17:59:50 +01:00
Arthur Schiwon
af781bdea7
fix DI
2014-02-11 10:50:03 +01:00
Arthur Schiwon
41e8d44cf7
move sorter into a class
2014-02-11 10:49:34 +01:00
Arthur Schiwon
1d0a236563
respect coding guidelines
2014-02-11 10:49:27 +01:00
Arthur Schiwon
71e4d965a1
on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430
2014-02-11 10:49:22 +01:00
Joas Schilling
dbec143f09
Change MySQL to MySQL/MariaDB in the frontend
...
Fix issue #6269
2014-02-07 17:03:43 +01:00
Joas Schilling
145d9a09ab
Do not select input for all text input fields
...
Fix issue #6920
2014-02-07 16:31:29 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Thomas Müller
79fc4f3126
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
2014-02-06 11:34:27 +01:00
Thomas Müller
0db5fead8e
remove some more global variable $RUNTIME_NOAPPS
2014-02-06 10:04:18 +01:00
Thomas Müller
afbe50d09c
remove global variable $RUNTIME_NOAPPS - it's just superfluous
2014-02-06 09:44:13 +01:00
Thomas Müller
e2625ae7aa
fixing autoconfig handling
2014-02-05 18:23:40 +01:00
Vincent Petry
3d88b10f20
Merge pull request #7067 from owncloud/core-sessionheartbeatconfig
...
Core sessionheartbeatconfig
2014-02-05 10:03:36 +01:00
Thomas Müller
ced80c6f27
Merge pull request #6969 from owncloud/tests-morecoverage
...
Fixed unit test scripts + coverage
2014-02-04 12:21:13 -08:00
Thomas Müller
45ab9810c5
fixing typos
2014-02-04 20:58:06 +01:00
Morris Jobke
3c80071807
Merge pull request #4795 from owncloud/setup
...
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
Vincent Petry
e75f7e58e9
Added unit tests for session_keepalive / heartbeat
2014-02-04 13:56:41 +01:00
Vincent Petry
912da8d277
Added session_keepalive setting
...
When session_keepalive is true (default) the heartbeat will be send as
often as the half of the session timeout value.
2014-02-04 13:56:10 +01:00
Jan-Christoph Borchardt
cfcd71f3e4
better picture icon, fix https://github.com/owncloud/apps/issues/1401
2014-02-03 18:47:25 +01:00
Morris Jobke
5844d682a7
Use === instead of ==, add missing whitespace and CSS class
2014-02-01 15:02:36 +01:00
Bart Visscher
d8ec7e2701
DRY for database type radiolist
2014-01-31 17:31:19 +01:00
Bart Visscher
12a900de25
Do setup default value handling in the controller not the template
2014-01-31 16:57:49 +01:00
Bart Visscher
bca725dc32
Merge branch 'master' into setup
...
Conflicts:
core/setup.php
2014-01-31 16:43:12 +01:00
Bart Visscher
b57299f727
Merge branch 'master' into db-convert-tool
...
Conflicts:
3rdparty
2014-01-30 18:16:55 +01:00
Georg Ehrke
f7c291e276
remove empty line
2014-01-30 16:32:45 +01:00
Georg Ehrke
c5742520e1
don't urldecode get var, php does this automatically
2014-01-30 16:32:45 +01:00
Vincent Petry
63cca35baa
Added core unit tests for basename and dirname
...
Note that it doesn't work 100% like the PHP functions so the tests
have TODO comments to fix those core functions eventually.
2014-01-30 13:22:16 +01:00
Vincent Petry
f7ac9f8069
Fixed unit test scripts + coverage
...
Tried to add more apps (others break).
"preprocessors" is now populated automatically based on the tested apps.
2014-01-30 11:56:14 +01:00
Raghu Nayyar
299a8285bd
Merge pull request #6278 from nickvergessen/issue/6263
...
[issue/6263] layout.user.php code is not valid markup
2014-01-29 10:42:17 -08:00
Jan-Christoph Borchardt
271088a7a2
Merge pull request #6777 from owncloud/mobile-style
...
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
jbtbnl
f798ad9a20
Add white color variant of checkmark icon
2014-01-29 13:47:37 +01:00
Jan-Christoph Borchardt
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
Morris Jobke
cf2c061f1f
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
...
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Morris Jobke
25305a535b
Merge pull request #6958 from owncloud/localised_date
...
use localised date in notification mails
2014-01-27 04:54:30 -08:00
Morris Jobke
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Bjoern Schiessle
2bb13a8db9
use localised date in notification mails
2014-01-27 12:47:54 +01:00
Jan-Christoph Borchardt
46745895ae
Merge pull request #5153 from owncloud/core-em-to-px
...
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt
6fbc73e673
Merge pull request #5152 from owncloud/files-em-to-px
...
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
raghunayyar
932e8f9f58
Fixes width of the dropdown menus as per computed styles.
2014-01-26 02:59:28 +05:30
Vincent Petry
3bea9b8ddd
Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
...
add expire date to link share if possible
2014-01-24 07:44:33 -08:00
Vincent Petry
c6695bbd76
Fixed download URL in public page
...
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry
41b6d4b702
Added OC.buidQueryString() utility function
...
Makes it possible to create query strings by passing a JavaScript hash
map and automatically encodes the keys and values.
2014-01-24 12:44:31 +01:00
Bjoern Schiessle
77de47858b
add expire date to link share if possible
2014-01-24 10:46:08 +01:00
Thomas Müller
9fa788c452
Merge pull request #6736 from owncloud/tests-jsunittests
...
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Jan-Christoph Borchardt
25e9b7a742
add icons.css file, first step to get rid of %webroot%
2014-01-23 12:55:39 +01:00
Thomas Müller
f950ce82ae
Merge branch 'master' into mobile-style
...
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Jan-Christoph Borchardt
f46e660737
do not check 'remember' log in by default
2014-01-21 17:02:59 +01:00
Morris Jobke
903b330ccc
Merge pull request #6721 from tsumi/patch-1
...
Added SVG fallback to apps settings popup
2014-01-18 08:34:45 -08:00
Morris Jobke
ce0cbbd7bc
remove comment & add space
2014-01-18 14:22:56 +01:00
Jan-Christoph Borchardt
3e803b5e36
restrict zooming on mobile devices for the publicly accessible, optimized pages
2014-01-17 14:41:05 +01:00
Jan-Christoph Borchardt
1d380a2011
optimize size of toggle icons
2014-01-17 13:28:25 +01:00
Jan-Christoph Borchardt
ccadab96a6
add icons for file list and picture view toggles
2014-01-17 12:51:13 +01:00
Konstantin.Popov
9d355f2124
remove fix for IE9 nav bar width
2014-01-17 13:41:51 +04:00
Vincent Petry
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
raghunayyar
12e5d0f68d
Fixes typos, adds ; wherever not present.
2014-01-16 21:06:14 +05:30
raghunayyar
775e08e0ee
Merge branch 'master' into core-em-to-px
...
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
2014-01-16 14:42:37 +05:30
raghunayyar
f975fd5499
Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase
2014-01-16 14:23:39 +05:30
Morris Jobke
5c1a9f35f1
Indicate password strength using strengthify
...
* uses zxcvbn
* outsourced to separate jquery plugin
* async loading
* hide strength meter if input is empty
* feedback if user enters weakest password
* fade in and out
* show tipsy with strength
* Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
tsumi
f41255f652
Useless else removed
...
As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
2014-01-15 09:39:21 +01:00
Thomas Müller
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
Thomas Müller
fcf6653e64
Merge pull request #6694 from owncloud/fix-email-template-l10n
...
fix email template l10n, emphasize filename
2014-01-13 04:34:28 -08:00
Bart Visscher
2638fd4767
Postgresql needs the sequences adjusted after the inserts
2014-01-11 12:25:35 +01:00
Bart Visscher
af3bedf985
Add option to remove all the tables from the destination database
2014-01-11 12:23:28 +01:00
Bart Visscher
1b7eb4dc6c
Quote column names on insert
2014-01-11 12:22:23 +01:00
tsumi
7c1649fc24
Added SVG fallback to apps settings popup
...
This fix issue of calendar app with IE8, see issue report for details:
https://github.com/owncloud/calendar/issues/291
2014-01-10 21:19:30 +01:00
Vincent Petry
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
Joas Schilling
17c00f34d3
Add alt attribute for img elements
2014-01-10 10:19:08 +01:00
Joas Schilling
d95cab632b
Extend margin to avoid displaying a scrollbar
2014-01-10 10:17:19 +01:00
Joas Schilling
3ae17d0785
Fix unallowed child elements
2014-01-10 10:17:19 +01:00
Jan-Christoph Borchardt
76a7ae77a8
fix email template l10n, emphasize filename
2014-01-09 10:54:23 +01:00
blizzz
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Jenkins for ownCloud
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
Jörn Friedrich Dreyer
f356894aa3
Merge pull request #6594 from owncloud/kill-index.php-from-url
...
Kill index.php from url
2014-01-07 22:28:58 -08:00
Arthur Schiwon
bc1235d325
Add command line tool to show numbers of users and user directories
2014-01-07 23:06:37 +01:00
Jenkins for ownCloud
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
0e843b9d7d
[tx-robot] updated from transifex
2014-01-06 01:55:59 -05:00
Morris Jobke
ce3df44699
Merge pull request #6031 from s0taka/master
...
No decimal points for Kilobyte and Byte #5371 .
2014-01-05 11:52:10 -08:00
Jenkins for ownCloud
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
Thomas Müller
988710b0fc
avoid conflict with physical file config.js
2013-12-31 14:34:28 +01:00
Jenkins for ownCloud
760fa9ea30
[tx-robot] updated from transifex
2013-12-31 01:55:42 -05:00
Jenkins for ownCloud
9ea9638490
[tx-robot] updated from transifex
2013-12-30 01:55:38 -05:00
Jenkins for ownCloud
7b2f4b08ac
[tx-robot] updated from transifex
2013-12-26 01:55:34 -05:00
Jenkins for ownCloud
dbfe313a63
[tx-robot] updated from transifex
2013-12-25 01:55:35 -05:00
Thomas Müller
a87a18d56c
Merge pull request #6561 from syncloud/master
...
Made admin password field required on client side
2013-12-24 14:25:01 -08:00
Bart Visscher
4e1a3f212f
Review points
2013-12-24 13:44:35 +01:00
Bart Visscher
202e26647e
Inject config object
2013-12-24 13:36:32 +01:00
Jenkins for ownCloud
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
Vladimir Sapronov
cef39243f8
Made password field required on client side
...
Fix for case described in https://github.com/syncloud/owncloud-setup/issues/19
2013-12-22 17:43:50 -05:00
Jenkins for ownCloud
cd26631a6d
[tx-robot] updated from transifex
2013-12-21 01:56:13 -05:00
Frank Karlitschek
dc45141f4a
Merge pull request #6262 from nickvergessen/issue/4375
...
correctly mark app management active
2013-12-20 02:27:52 -08:00
Jenkins for ownCloud
37cdbc3be0
[tx-robot] updated from transifex
2013-12-19 01:57:03 -05:00
Simon Könnecke
8fdc4585f7
spaces to tabs
2013-12-18 15:43:45 +01:00
Thomas Müller
f57c38df77
Merge pull request #6431 from owncloud/core-pluraltranslationsfix
...
Added plural translation fallback
2013-12-18 03:11:18 -08:00
Jenkins for ownCloud
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
Jenkins for ownCloud
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
Frank Karlitschek
753525c57f
Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
...
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
Bjoern Schiessle
3e17fbe30d
always show home breadcrumb in files view
2013-12-16 17:40:35 +01:00
Vincent Petry
d8d11e3976
Fixed JS plural function to be per app
...
Some apps might not define the same "nplural" value.
To avoid conflicts, the plural function is now generated per app.
Fixes #6427
2013-12-16 16:00:23 +01:00
Jenkins for ownCloud
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
Vincent Petry
ad998c1fb5
Merge pull request #6390 from owncloud/migration-fixwebroot
...
Fix webroot for update page
2013-12-13 05:35:29 -08:00
Vincent Petry
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Jenkins for ownCloud
7b20212c0a
[tx-robot] updated from transifex
2013-12-11 13:32:13 -05:00
Vincent Petry
22abc53e3b
Merge pull request #5968 from owncloud/legacy-popup-fixes
...
fix the legacy popup to make calendar settings look nicer
2013-12-10 05:37:52 -08:00
Joas Schilling
009e25788f
correctly mark app management active
2013-12-09 15:53:31 +01:00