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
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
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
Jenkins for ownCloud
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
Jan-Christoph Borchardt
e574158bd8
fix shadow size and arrow position
2013-12-09 12:21:37 +01:00
blizzz
bc3650e48c
Merge pull request #6231 from owncloud/fix-plural-l10n
...
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Morris Jobke
823c85e65f
Merge pull request #6202 from owncloud/fix_6032_alt
...
Add overlay noscript message to fix #6032
2013-12-07 08:04:29 -08:00
Morris Jobke
3444c15b86
fix IE8 transparent background
2013-12-07 17:03:53 +01:00
Morris Jobke
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
ringmaster
1dc9998920
Remove reference to ownCloud.
2013-12-05 17:01:51 -05:00
unknown
853373348c
Slide duration set to 200ms for multiselect (same duration as user menu)
2013-12-05 15:46:13 -05:00
Morris Jobke
ec0aa6bb65
Revert "Merge pull request #6210 from owncloud/fix-5865"
...
This reverts commit f12363d90b
, reversing
changes made to eba35d28cd
.
2013-12-05 21:03:17 +01:00
unknown
fd3aae6691
Changed duration of slideDown, slideUp and fadeOut to 200ms
2013-12-05 13:15:52 -05:00
ringmaster
e7748613ef
Link to enable-javascript.com
2013-12-05 12:06:20 -05:00
ringmaster
1687ec0cd2
Make noscript message translatable
2013-12-05 09:52:13 -05:00
ringmaster
38745e4bd1
Move message up 10%
2013-12-05 09:48:20 -05:00
ringmaster
bdab0409c4
Add overlay noscript message to fix #6032
2013-12-05 09:19:46 -05:00
Morris Jobke
1620015531
fix appearance of error message - .errors is outdated
2013-12-05 11:23:30 +01:00
Jenkins for ownCloud
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
Vincent Petry
72f80c972f
Merge pull request #5946 from owncloud/public-page-details
...
Public page details
2013-12-03 07:26:00 -08:00
Thomas Müller
ab21e1b16e
Merge pull request #5931 from owncloud/fix-time-field-properly
...
fix time input field properly, details
2013-12-03 07:23:04 -08:00
zombiehugs
519f63ee97
Revert "[fix] Center Share Dropdown & Versions Dropdown"
...
This reverts commit 1dbbfcf3dc
.
2013-12-03 08:23:13 -06:00
zombiehugs
1dbbfcf3dc
[fix] Center Share Dropdown & Versions Dropdown
...
Center Share Dropdown & Versions Dropdown
2013-12-03 08:14:06 -06:00
Morris Jobke
b3a96c081b
fix public page - gallery view issues
2013-12-03 13:46:58 +01:00
Jan-Christoph Borchardt
c44f534c2b
account for shift of controls bar due to app navigation, do not shift on public page
2013-12-03 10:54:16 +01:00
Jenkins for ownCloud
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
Thomas Müller
338a55e36c
Merge pull request #6128 from owncloud/fix-6126-master
...
Also merge autoconfig variables into $_REQUEST.
2013-11-29 11:22:44 -08:00
Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
Andreas Fischer
2ec085b51f
Also merge autoconfig variables into $_REQUEST.
2013-11-29 16:24:48 +01:00
Frank Karlitschek
1dc931b778
Merge pull request #5984 from owncloud/nav-scrollbar
...
always show app navigation scrollbar when too many apps in there
2013-11-29 03:27:50 -08:00
Morris Jobke
587fc1aff3
Fix resize issue for trash button in chrome and overflowing spinner in .update class
...
fixes #6108
2013-11-28 21:36:43 +01:00
Frank Karlitschek
6c16d45dc7
Merge pull request #6070 from ganomi/showstars
...
Show stars as password placeholder for sharing
2013-11-28 02:16:44 -08:00
Morris Jobke
54b24ca88d
Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
...
show a message at the log-in screen if inital encryption take place
2013-11-27 14:10:11 -08:00
Morris Jobke
55d7cf8ffd
improve encryption message
2013-11-27 23:07:19 +01:00
Bjoern Schiessle
0219b8b3b9
add spinner to the template so that it can be loaded in time
2013-11-27 22:36:47 +01:00
Bjoern Schiessle
e0924a5f07
switch to large spinner
2013-11-27 21:58:38 +01:00
Jenkins for ownCloud
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
Bjoern Schiessle
1536c7ea58
switch from "name" attribute to "id"
2013-11-27 17:01:21 +01:00
Morris Jobke
6b3b3d8af4
Fix for IE - an ugly horizontal scrollbar appears
...
* for IE9 the nav bar was too narrow
* for other IEs the width of each app element was to wide and
cause the horizontal scoll bar - now this content is hidden like
before this PR
2013-11-27 16:45:04 +01:00
Morris Jobke
41c6752030
fix navbar
2013-11-27 16:10:49 +01:00
Jan-Christoph Borchardt
3360719bbf
prevent shift of app names caused by scrollbar, part 2
2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt
f9f123c6f6
prevent shift of app titles caused by scrollbar
2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt
457a7d4baa
always show app navigation scrollbar when too many apps in there
2013-11-27 16:10:48 +01:00
ganomi
33e77d34f4
Show stars as placeholder
2013-11-26 20:17:13 +01:00
Bjoern Schiessle
7240d349da
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-26 19:15:53 +01:00
Bjoern Schiessle
c7e1fe50c2
added a small version of the dark loading gif, looks nicer on the blue background
2013-11-26 17:14:16 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Morris Jobke
81f6be92ef
Translate reload message after update
...
fixes #6064
2013-11-26 16:22:01 +01:00
Robin Appelman
10d84f6e9b
Add a (currently) empty system for running common repair steps
2013-11-26 14:12:48 +01:00
Jenkins for ownCloud
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
Bjoern Schiessle
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
Robin Appelman
9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
icewind1991
4626fae882
Merge pull request #6038 from owncloud/occ-app-enable
...
add occ commands for enabling and disabling apps
2013-11-25 10:12:49 -08:00
Robin Appelman
abe63bd329
Add occ command to list all apps
2013-11-25 17:34:16 +01:00
Robin Appelman
fc1d897ea5
rename app_id to app-id
2013-11-25 17:28:01 +01:00
Morris Jobke
4dc35909b5
Fix navbar issue
...
fixes #6024
2013-11-25 17:04:19 +01:00
Robin Appelman
1bcb04f94e
Add template for single user mode message
2013-11-25 15:59:37 +01:00
Robin Appelman
a324c09e6c
Add occ command to enable and disable single user mode
2013-11-25 15:27:05 +01:00
Robin Appelman
d3bfb433d1
add occ commands for enabling and disabling apps
2013-11-25 13:20:16 +01:00
Simon Könnecke
243f3f0c4c
No decimal points for Kilobyte and Byte #5371 .
2013-11-25 12:26:03 +01:00
Thomas Müller
60e2ee631a
Merge pull request #5998 from owncloud/navigation-fix
...
Doesn't Cut the top arrow from navigation
2013-11-24 15:02:56 -08:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Morris Jobke
ae6610f0ea
fix navigation scrollbar
2013-11-22 15:48:24 +01:00
Jenkins for ownCloud
60cfdae503
[tx-robot] updated from transifex
2013-11-21 21:07:12 -05:00
raghunayyar
aa5d5a422f
Doesn't Cut the top arrow from navigation
2013-11-22 02:10:22 +05:30
Jenkins for ownCloud
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
Thomas Müller
02b92137b3
unify translation string - less work for the translators
2013-11-21 09:58:35 +01:00
Jan-Christoph Borchardt
5cb8fd2bad
fix the legacy popup to make calendar settings look nicer
2013-11-20 16:29:00 +01:00
Frank Karlitschek
8bc339413b
Merge pull request #5926 from owncloud/less-bold
...
remove bold from legend, table header, label - less obtrusive
2013-11-19 13:57:21 -08:00
Jan-Christoph Borchardt
59e75d4326
fix time input field properly, details
2013-11-18 19:44:56 +01:00
Jan-Christoph Borchardt
b678766c7d
remove bold from legend, table header, label - less obtrusive
2013-11-18 17:32:06 +01:00
Jan-Christoph Borchardt
463b054530
adjust input CSS to multiline, coding guidelines
2013-11-18 16:14:13 +01:00
Jan-Christoph Borchardt
8dd50dc9a6
fix input type time fields, have them use the default styles
2013-11-18 14:51:43 +01:00
Bjoern Schiessle
7f3d717037
Check which permissions are possible to re-share a file
2013-11-18 11:58:42 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Vincent Petry
f670d74634
Added min-height in case of empty multi-select
2013-11-14 14:26:48 +01:00
Vincent Petry
55355ba28e
Fixed multiselect to not set the button's height on itself after select
...
Fixes #5841
2013-11-14 14:18:22 +01:00
Morris Jobke
c9517c4fc8
new line for css rule
2013-11-12 11:31:58 +01:00
Arthur Schiwon
5c31440dcd
Disabled textareas should look like they are disabled
2013-11-11 19:41:51 +01:00
Jenkins for ownCloud
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
Jenkins for ownCloud
263603aa4c
[tx-robot] updated from transifex
2013-11-06 21:44:36 -05:00
Thomas Müller
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
Andreas Fischer
c40515c33f
Merge pull request #5531 from owncloud/upgrade-form-occ
...
Add `occ upgrade` command.
* owncloud/upgrade-form-occ:
Add some color to the occ upgrade output.
Use "else if" to remove one level of indentation.
Missed one write()->writeln(). Fixed.
Use writeln() instead of write()
Use the OutputInterface for output and return error codes.
Move all upgrade routines into the command-line tool.
Add `occ upgrade` command.
2013-10-31 15:30:35 +01:00
Vincent Petry
28fbc1b3cc
Fixed input field and tipsy positioning in singleselect
...
If the user scrolls or the window is resized, the formerly cached offset
was wrong. This fix makes sure the offset is re-read before showing the
input field.
2013-10-31 10:50:18 +01:00
Vincent Petry
9d230bcc75
Improve quota input field
...
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
2013-10-30 20:46:53 +01:00
Bjoern Schiessle
4c7082bf1d
allow to share a file/folder as public link also if one of it parents was already shared as link
2013-10-30 17:03:53 +01:00
Jenkins for ownCloud
54ae799cd9
[tx-robot] updated from transifex
2013-10-30 03:33:25 -04:00
Andreas Fischer
70111ea299
Add some color to the occ upgrade output.
2013-10-28 22:26:44 +01:00
Andreas Fischer
b8dbec0da4
Use "else if" to remove one level of indentation.
2013-10-28 22:22:59 +01:00
ringmaster
f130caa4a2
Missed one write()->writeln(). Fixed.
2013-10-28 17:06:36 -04:00
ringmaster
bca1e12597
Use writeln() instead of write()
2013-10-28 16:53:36 -04:00
ringmaster
d1c5e5d777
Use the OutputInterface for output and return error codes.
2013-10-28 16:50:28 -04:00
Thomas Müller
8ab5da0833
Merge pull request #5592 from owncloud/lost_password_screen
...
Fixing lost password-screen
2013-10-29 09:50:32 -07:00
Morris Jobke
7223b5acce
Merge pull request #5396 from owncloud/fix-sharing-code
...
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
Morris Jobke
b56c936212
also add new parameter to function calls
2013-10-29 14:22:24 +01:00
Morris Jobke
ffbcfef614
fix lost password screen - reuse available CSS rules
2013-10-29 13:42:39 +01:00
Jenkins for ownCloud
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
Julian Müller
776346b503
Fixing the lost Password Screen
2013-10-29 01:33:12 +01:00
Julian Müller
e9caaa933c
Fixing the Lost Password Screen
2013-10-29 01:29:38 +01:00
ringmaster
a24cbb50af
Move all upgrade routines into the command-line tool.
2013-10-28 10:15:56 -04:00
Vincent Petry
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
Jenkins for ownCloud
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
Jenkins for ownCloud
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
Arthur Schiwon
3248b0e2be
Fix broken users page when a username consists of digits only, fixes #5560
2013-10-25 22:00:32 +02:00
ringmaster
29a21466f3
Add `occ upgrade` command.
2013-10-24 13:59:39 -04:00