Bernhard Posselt
a56dc4bc94
dont overwrite background image when hovering over button
2013-04-12 14:30:16 +02:00
Jan-Christoph Borchardt
2e04a35277
use proper sans-serif font-stack
2013-04-11 17:20:24 +02:00
Bernhard Posselt
18c873d1e5
Merge pull request #2554 from owncloud/hide-toggle-checkbox
...
Implements Hide / Display for the Password Toggle Button
2013-04-11 01:18:40 -07:00
Bernhard Posselt
a028ba930a
Merge pull request #2853 from owncloud/long-file-names
...
Application Names Ellipsise when the name length exceeds the width of the navigation.
2013-04-10 15:02:37 -07:00
raghunayyar
da882b1320
The Opacity for the navigation loads fine for icon and App name.
2013-04-10 19:30:28 +05:30
raghunayyar
000a568b4a
Long Application Names are ellipsis correctly.
2013-04-10 19:14:50 +05:30
Jenkins for ownCloud
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
Bart Visscher
51e07a90b7
Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
...
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
Bart Visscher
f9b77e392c
Suppress the notice from the nullbyte check
2013-04-09 21:11:44 +02:00
kondou
5f89812a9b
Fix #2730
...
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
kondou
e44cc8ea57
Fix OC.dialogs.form()
...
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
Bernhard Posselt
27d8337728
Merge pull request #2697 from owncloud/button-css-fixes
...
Button css fixes
2013-04-09 03:04:34 -07:00
Jenkins for ownCloud
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
kondou
9c53f35d9a
Remove manual mimetype checking.
2013-04-08 23:00:02 +02:00
Jenkins for ownCloud
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
Morris Jobke
38941a61bf
turn off autocompletion for password field
...
refs #2632
2013-04-07 21:51:10 +02:00
kondou
f59aedff4f
Optimize pictures with optipng.
2013-04-07 20:09:25 +02:00
Thomas Tanghus
870b73ce5a
Add octemplate jQuery plugin
2013-04-06 23:24:43 +02:00
Thomas Tanghus
75af38c1bd
Move compatibility functions to compatibility.js and add two more.
2013-04-06 22:37:15 +02:00
kondou
275badaf76
Make files _and_ directorys selectable/browsable.
...
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02:00
Bart Visscher
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou
d556e7fbc0
Make files selectable again.
2013-04-06 17:22:55 +02:00
kondou
3e185911f1
Fix repeating directory names.
...
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
kondou
fba6681f71
Make directories show at top.
2013-04-06 14:42:56 +02:00
kondou
6231e5be39
Make directories clickable.
...
A bit bugged though ...
2013-04-06 14:17:47 +02:00
kondou
1919acd68f
Small fixes
...
* escapeHTML(everything)
* curly braces for if
* camelcase function_to_call
* add missing semicolae (?)
2013-04-06 12:16:55 +02:00
kondou
0be80abe70
Refactor OCdialogs.
...
Fix #2557 and make the whole code more usable.
2013-04-06 10:07:12 +02:00
Jan-Christoph Borchardt
5525fade11
Merge pull request #2737 from Kondou-ger/proper_css_comments
...
Proper CSS comment
2013-04-05 07:58:00 -07:00
root
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
root
69105fce00
Proper CSS comment
...
CSS comments don't work like that.
2013-04-05 01:17:52 +02:00
Jenkins for ownCloud
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
Jenkins for ownCloud
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
Jan-Christoph Borchardt
cd079e3421
group some selectors again
2013-04-03 20:06:26 +02:00
Jan-Christoph Borchardt
a35d869e15
add styles for disabled input fields
2013-04-03 18:45:03 +02:00
Jan-Christoph Borchardt
1c55b3a969
button selector cleanup
2013-04-03 17:55:31 +02:00
Jenkins for ownCloud
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
Arthur Schiwon
e25c1f3130
port 22c8194cc8
2013-04-02 21:03:13 +02:00
Jan-Christoph Borchardt
48afa39292
Merge pull request #2275 from owncloud/app-styles
...
CSS styles for applications to make a tree like layout easier
2013-04-02 04:24:06 -07:00
Jan-Christoph Borchardt
c94580ba29
revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal
2013-04-02 11:52:57 +02:00
Jenkins for ownCloud
29d33ff7c2
[tx-robot] updated from transifex
2013-04-02 00:04:27 +02:00
Jenkins for ownCloud
9e29d2845a
[tx-robot] updated from transifex
2013-04-01 00:04:02 +02:00
Bernhard Posselt
ab40634f33
Merge pull request #2622 from Kondou-ger/add_missing_backticks
...
Add (two) missing backticks.
2013-03-30 18:53:22 -07:00
Jenkins for ownCloud
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
root
7f74f08808
Add missing backticks.
...
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
Jenkins for ownCloud
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
Bernhard Posselt
86ac30c596
Merge pull request #2516 from kabum/master
...
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
Jenkins for ownCloud
7098bcd4b7
[tx-robot] updated from transifex
2013-03-28 00:03:44 +01:00
Arthur Schiwon
c51396551d
Whitespaces
2013-03-27 22:55:17 +01:00
Arthur Schiwon
3af61a0a7c
Share Dialog: show Displayname instead of internal name
2013-03-27 22:55:05 +01:00
Arthur Schiwon
18554059a4
Remove Debug output
2013-03-27 19:12:53 +01:00
Arthur Schiwon
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
Jan-Christoph Borchardt
994a8797e4
remove extra type selector qualification for ID and class names
2013-03-27 17:39:09 +01:00
Jan-Christoph Borchardt
0b1dc7b0cc
also use SVG for settings cog
2013-03-27 17:33:25 +01:00
Jan-Christoph Borchardt
5aa1ca5882
use SVG for folder image
2013-03-27 17:32:37 +01:00
Jan-Christoph Borchardt
bcf1b6f9f8
soften highlight for navigation entries
2013-03-27 17:11:40 +01:00
Jan-Christoph Borchardt
e167ccc5c6
modify app styles to adhere to coming CSS coding guidelines
2013-03-27 16:14:17 +01:00
Jenkins for ownCloud
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
raghunayyar
8d7aa42b9a
Removes the setTimeout() method.
2013-03-26 23:32:26 +05:30
raghunayyar
25a8690318
Fixes autofill for display / hide toggle button, a better function name.
2013-03-25 16:09:35 +05:30
raghunayyar
d9cd9875e0
Initial Commit : Password Toggle Button hides if no input present
2013-03-25 04:30:09 +05:30
Bernhard Posselt
c022dbe5c8
added %webroot% instead of relative path
2013-03-23 00:37:31 +01:00
Bernhard Posselt
bee9f7ebc6
also make bottom border grey on first level hover
2013-03-23 00:35:18 +01:00
Bernhard Posselt
adaf1d1959
small fixes
2013-03-23 00:35:18 +01:00
Bernhard Posselt
5d3e3a0a75
added app stylings to core
2013-03-23 00:35:18 +01:00
Jenkins for ownCloud
4f6e13e673
[tx-robot] updated from transifex
2013-03-23 00:06:16 +01:00
Morris Jobke
79d99b9c96
use simple markup to highlight groups in share autocomplete
2013-03-22 10:00:43 +01:00
Morris Jobke
8871629db5
replace hardcoded css style with css class - ref owncloud/core#173
2013-03-21 23:19:59 +01:00
Morris Jobke
a1a6ef9409
share autocomplete - improve group appearance
...
highlight groups with markup (bold font) instead of "(group)" postfix
ref owncloud/core#173
2013-03-21 22:45:36 +01:00
yannickoo
43b928aca6
Fixed typo
2013-03-21 18:46:59 +01:00
yannickoo
55fc03fda4
No Scrolling for more than approximately 10 Applications
2013-03-21 18:37:23 +01:00
Lukas Reschke
ad2d222466
Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
...
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-21 00:46:09 -07:00
Jenkins for ownCloud
3b1c7de459
[tx-robot] updated from transifex
2013-03-21 00:04:36 +01:00
Lukas Reschke
68d55648d5
Show a warning in the installer if the used PHP version is vulnerable to the NULL Byte attack
2013-03-20 08:44:33 +01:00
Lukas Reschke
dc41cf081c
Check if the installed PHP version has a fix for the nullbyte vulnerability
2013-03-20 08:43:54 +01:00
Jenkins for ownCloud
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
Doug Neiner
b8c1a4da3e
Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms
2013-03-17 22:21:34 -05:00
Jenkins for ownCloud
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
Henning Oschwald
76bb5221c7
Restores keyboard accessibility for expandable settings area.
...
Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
2013-03-16 16:32:55 +01:00
Frank Karlitschek
761540e78b
Merge pull request #2320 from ceri/master
...
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
Jenkins for ownCloud
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
Björn Schießle
8154b4be7d
use display name as sender for private link mails, approved in #2294
2013-03-14 13:26:20 +01:00
Ceri Davies
17cb47fbf6
Correct emails when folders are shared.
...
itemType is never "dir"; it's either "file" or "folder".
2013-03-14 10:04:58 +00:00
Jenkins for ownCloud
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
Jenkins for ownCloud
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
Bernhard Posselt
1e20067c00
Merge pull request #2183 from owncloud/fix-shared-statuses-again
...
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
Jenkins for ownCloud
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
Jenkins for ownCloud
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
Bernhard Posselt
9ad03b61a3
Update share.js
...
Added HTML escaping
2013-03-08 17:29:05 +01:00
Michael Gapczynski
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
Florian Hülsmann
0aa6c1b163
fixed header content padding
2013-03-07 19:28:17 +01:00
Frank Karlitschek
19073e0711
Merge pull request #2167 from owncloud/input-type-fix
...
Input type fix
2013-03-07 07:28:22 -08:00
Thomas Müller
a2aebbd742
Merge pull request #2130 from owncloud/fix_2128
...
fix #2128
2013-03-06 05:05:40 -08:00
Georg Ehrke
a83a5aa900
fix #2128
2013-03-06 13:02:44 +01:00
Lukas Reschke
630ee644db
Don't sanitize error message hint
2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt
114c6457a3
add email input type to styled inputs, fix #2097
2013-03-06 12:38:43 +01:00
Michael Gapczynski
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
Jenkins for ownCloud
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
Lukas Reschke
76e6369ec1
Merge pull request #2077 from owncloud/oc_filepicker_inline_js
...
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 13:49:52 -08:00
Jan-Christoph Borchardt
07dee24cb2
explicitly add empty placeholder to inputs which use infield labels, fix #2049
2013-03-04 22:11:57 +01:00
Thomas Tanghus
e9f46a7452
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 16:36:49 +01:00
Bernhard Posselt
841daf4845
Merge pull request #2062 from owncloud/shareType
...
Sanitize shareWith
2013-03-03 16:27:51 -08:00
Lukas Reschke
577945bd33
Sanitize shareWith
2013-03-04 00:54:21 +01:00
Jenkins for ownCloud
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
Michael Gapczynski
0488968443
Merge pull request #2034 from owncloud/fix_bug47
...
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer
9cb5bf0a28
add ie css switch to layout templates
2013-03-03 13:57:20 +01:00
Jenkins for ownCloud
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
Georg Ehrke
620ddd3baa
new Array() -> []
2013-03-02 19:24:37 +01:00
Georg Ehrke
22424e8abc
update OC.Notification.show
2013-03-02 17:36:04 +01:00
Brice Maron
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
Thomas Müller
2af3bc3e77
Merge pull request #2022 from owncloud/fix-notice
...
Fix notice
2013-03-01 23:39:27 -08:00
Lukas Reschke
630483c75d
Fix notice
2013-03-02 00:53:53 +01:00
Jenkins for ownCloud
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
Georg Ehrke
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
Lukas Reschke
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
Bart Visscher
294403fa99
The router base url is without / on the end
2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt
fbb989f548
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
2013-02-28 12:07:56 +01:00
Jan-Christoph Borchardt
a2147c4f89
Merge pull request #1973 from owncloud/share-improvements
...
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 15:07:07 -08:00
Jenkins for ownCloud
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
Lukas Reschke
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
Lukas Reschke
39e28c0170
Typo...
2013-02-27 23:19:38 +01:00
Lukas Reschke
6f14bec70a
Add a missing )
2013-02-27 23:15:18 +01:00
Lukas Reschke
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
Lukas Reschke
40e51d13d2
Remove uneeded file
2013-02-27 22:35:37 +01:00
Bernhard Posselt
9508a58c79
Merge pull request #1944 from owncloud/query-caching-upgrade
...
Disable prepared query caching while doing an upgrade
2013-02-27 12:48:42 -08:00
Jan-Christoph Borchardt
e01ab04d2b
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 17:57:53 +01:00
Jenkins for ownCloud
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
Bernhard Posselt
a09076c3ac
Merge pull request #1955 from owncloud/login-button-alignment
...
quick fix for log in button not being aligned with input fields
2013-02-27 04:05:47 -08:00
Bernhard Posselt
0828bb7e0e
Merge pull request #1957 from owncloud/fix-895
...
Fix 895
2013-02-27 03:10:29 -08:00
Thomas Müller
58b06c5c9a
Merge pull request #1905 from owncloud/fix-share-icons
...
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt
a5d84b74d0
properly align triangle and unshare icons to text, also fixes line hopping
2013-02-27 11:30:33 +01:00
Jan-Christoph Borchardt
7ee5b2df13
fix ugly giant triangles
2013-02-27 11:30:06 +01:00
Jan-Christoph Borchardt
49cd9f20a6
fix shared by text going out of box, fix #895
2013-02-27 11:22:13 +01:00
Jan-Christoph Borchardt
f36d92bbc1
Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
...
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
Jan-Christoph Borchardt
86ffa28f72
quick fix for log in button not being aligned with input fields
2013-02-27 11:04:08 +01:00
Jenkins for ownCloud
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
Robin Appelman
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
Bart Visscher
aa8bf3bbaa
Merge pull request #1941 from owncloud/session_heartbeat
...
generate url only once for heartbeat
2013-02-26 11:49:59 -08:00
Bernhard Posselt
a65b16f3e7
generate url only once
2013-02-26 20:45:25 +01:00
Lukas Reschke
d3aecdab09
Merge pull request #1939 from owncloud/session_heartbeat
...
use 15 min instead of 15 sec timeout
2013-02-26 11:28:15 -08:00
Bernhard Posselt
81bb4363a2
use 15 min instead of 15 sec timeout
2013-02-26 20:25:07 +01:00
Frank Karlitschek
7eec31567f
Merge pull request #1938 from owncloud/session_heartbeat
...
implemented a heartbeat request which is calls the server every 15 minut...
2013-02-26 11:02:09 -08:00
Bernhard Posselt
4e55348054
implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout
2013-02-26 19:34:46 +01:00
Jan-Christoph Borchardt
6f09f57008
remove more unused logo files, now in promo
2013-02-26 14:28:17 +01:00
Jan-Christoph Borchardt
7a47786afd
align logo type pixel perfectly
2013-02-26 14:27:29 +01:00
Frank Karlitschek
69eb69be0e
Merge pull request #1902 from owncloud/angularcsp
...
add CSP turned on for angularjs
2013-02-26 00:58:12 -08:00
Frank Karlitschek
072daf8850
Merge pull request #1885 from houqp/issue_1776
...
when user changes displayName, also update it on expand button
2013-02-26 00:19:42 -08:00
Michael Gapczynski
5b732ac1ea
Move space
2013-02-25 20:52:01 -05:00
Michael Gapczynski
aa2ea9e3de
Fix adding share icons to share action
2013-02-25 20:20:29 -05:00
Jenkins for ownCloud
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
Qingping Hou
195b52cb63
Merge branch 'master' of github.com:owncloud/core into issue_1776
...
Conflicts:
core/templates/layout.user.php
2013-02-25 17:16:03 -05:00
Bernhard Posselt
b537cecdf3
add CSP turned on for angularjs
2013-02-25 22:54:05 +01:00
Lukas Reschke
6735701c1e
Merge pull request #1837 from owncloud/fix-user-template
...
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
Thomas Müller
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Qingping Hou
c111a3aa24
add span tag to displayname on expand button
2013-02-25 15:40:57 -05:00
Thomas Müller
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
Jenkins for ownCloud
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
Jenkins for ownCloud
6aa0ecc9b8
[tx-robot] updated from transifex
2013-02-23 00:05:33 +01:00
Thomas Mueller
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
Jörn Friedrich Dreyer
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Bart Visscher
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
Bart Visscher
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
Jenkins for ownCloud
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
Bart Visscher
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
Jan-Christoph Borchardt
e7d1bbfae3
fix giant advanced caret in installation
2013-02-21 18:20:14 +01:00
Jörn Friedrich Dreyer
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
Arthur Schiwon
eceb7341bb
make number-input fields look like they should
2013-02-21 16:25:47 +01:00
Jenkins for ownCloud
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
Brice Maron
4f4e81d3d2
Add message when trouble sending email ref #1799
2013-02-20 21:14:55 +01:00
raghunayyar
6ecc3d7ee1
Reduced email input width by 10% to increase space.
2013-02-20 23:08:21 +05:30
Frank Karlitschek
18dab4a88e
Merge pull request #1738 from owncloud/fix_multiselect_in_settings
...
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-20 08:34:26 -08:00
raghunayyar
326aae8a08
Hovering on the unshare doesnt spoil look
2013-02-20 21:59:12 +05:30
raghunayyar
d8e8dab006
Fixes the Email Button and the email input Width.
2013-02-20 21:37:23 +05:30
raghunayyar
170a5856e9
Merge branch 'sharing-css-fix' into sharing-dropdown-fixes
2013-02-20 21:25:18 +05:30
Thomas Mueller
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
Jörn Friedrich Dreyer
0efa4182dc
Update office icons
2013-02-20 10:42:54 +01:00
Frank Karlitschek
a085e4c435
Merge pull request #1720 from owncloud/usermenu-css
...
fix erroneous CSS, remove obsolete selectors
2013-02-19 10:44:58 -08:00
raghunayyar
d82c9fd623
Text stays inside the sharing dropdown
2013-02-19 15:12:35 +05:30
Jenkins for ownCloud
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
Thomas Mueller
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
Jenkins for ownCloud
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
Jenkins for ownCloud
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
Thomas Tanghus
5a8e0f2048
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-16 19:56:56 +01:00
Jenkins for ownCloud
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
Jan-Christoph Borchardt
953c87db9c
fix erroneous CSS, remove obsolete selectors
2013-02-15 18:37:52 +01:00
Robin Appelman
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
Jan-Christoph Borchardt
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
Jenkins for ownCloud
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
Thomas Mueller
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Thomas Müller
4320f23c87
Merge pull request #1702 from owncloud/remove-images
...
remove unused images to lessen packaged size
2013-02-14 12:46:40 -08:00
Thomas Müller
29bf3552a2
Merge pull request #1703 from owncloud/firstrunwizard-icons
...
Firstrunwizard icons
2013-02-14 12:41:23 -08:00
Lukas Reschke
5624f1b838
Merge pull request #1701 from owncloud/XSS-fixes
...
Sanitize HTML
2013-02-14 10:50:46 -08:00
Jan-Christoph Borchardt
5b20c30889
pixel align dark calendar and contacts icons
2013-02-14 18:52:32 +01:00
Jan-Christoph Borchardt
6adaf67f35
add dark calendar and contacts icon for firstrunwizard and others
2013-02-14 18:45:24 +01:00
Jan-Christoph Borchardt
bb52271d22
exchange bright caret with dark triangle
2013-02-14 18:22:45 +01:00
Jan-Christoph Borchardt
a410529b15
remove unused images to lessen packaged size
2013-02-14 18:20:53 +01:00
Lukas Reschke
c7094197bf
Sanitize HTML
2013-02-14 18:15:14 +01:00
Bernhard Posselt
db30f94fc8
Merge pull request #1697 from owncloud/navigation-details
...
Navigation details
2013-02-14 08:39:17 -08:00
Jan-Christoph Borchardt
3f09cc139f
double speed for user menu slide
2013-02-14 17:13:50 +01:00
Jan-Christoph Borchardt
95575a7fd1
simplify noise (immense file size reduction), also apply to user menu and header, fix #1576
2013-02-14 17:06:08 +01:00
Jan-Christoph Borchardt
1edfe874f5
only style text, password and search inputs like inputs, instead of using unsupported :not selector
2013-02-14 15:53:36 +01:00
Jan-Christoph Borchardt
53a3a307e8
no ugly border around checkboxes or radio buttons
2013-02-14 15:47:14 +01:00
Thomas Mueller
e643742eb3
adding prototype trim as fallback for IE8
2013-02-14 12:59:26 +01:00
Thomas Mueller
8065c73339
fixing eventsource.js for IE8
2013-02-14 12:20:22 +01:00
Thomas Mueller
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
Jan-Christoph Borchardt
f9a6ed6c73
fix navigation icons SVG replacement, also hover and active opacity for IE
2013-02-14 10:59:30 +01:00
Jan-Christoph Borchardt
09d9138f84
fix caret on installation page for IE
2013-02-14 10:58:05 +01:00
Jan-Christoph Borchardt
7d8898065e
only show navigation scrollbar on hover, when needed, to be less obtrusive
2013-02-14 09:58:31 +01:00
Bart Visscher
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
Jenkins for ownCloud
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
Jan-Christoph Borchardt
6d7e324f4b
Merge pull request #1574 from owncloud/installation-label-overflow
...
Installation label overflow, fix #871
2013-02-13 07:55:05 -08:00
Jenkins for ownCloud
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
raghunayyar
ed1c943f61
Makes password toggle button inside input.
2013-02-12 16:52:38 +05:30
Thomas Mueller
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
Jenkins for ownCloud
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
Thomas Müller
58e57151e5
Merge pull request #1625 from owncloud/fix_shared_string
...
fix bug while changing string from "Share" to "Shared"
2013-02-11 12:39:16 -08:00
Jenkins for ownCloud
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
Björn Schießle
45ed0c6010
if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's
2013-02-11 15:37:01 +01:00
Jan-Christoph Borchardt
efc70e27bc
Merge pull request #1610 from owncloud/improved_personal_page
...
add the buttons for the clients to the personal page.
2013-02-11 03:51:11 -08:00
Robin Appelman
a7bfee576b
Fix breadcrumbs overlapping into the content, preventing the select all checkbox from being clickable in subfolders
2013-02-11 11:58:55 +01:00
Jenkins for ownCloud
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
Bernhard Posselt
f097fade01
Merge pull request #1601 from owncloud/lightbox-icons
...
add big white icons for lightbox, slideshow etc
2013-02-10 09:44:37 -08:00
Jan-Christoph Borchardt
c5e17e099a
split close and delete icon, add red hover for delete
2013-02-10 18:31:33 +01:00
Jan-Christoph Borchardt
0c4487d292
add big white icons for lightbox, slideshow etc
2013-02-10 18:06:18 +01:00
Björn Schießle
45a4016878
Merge pull request #1552 from raghunayyar/personalpage-style-fix
...
Personal Page Password Toggle Loads Fine.
2013-02-10 07:31:05 -08:00
Administrator
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
Jan-Christoph Borchardt
1ba44a3325
Merge pull request #1538 from raghunayyar/admin-password-toggle
...
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
Jenkins for ownCloud
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
Thomas Müller
460faf3f97
Merge pull request #1569 from owncloud/clean-app-id
...
Remove invalid characters from app id to prevent loading of invalid reso...
2013-02-09 09:56:26 -08:00
Bernhard Posselt
0664b98b4f
added icons and mimetypes for .msi and .exe files
2013-02-09 18:09:03 +01:00
Jörn Friedrich Dreyer
bb656ca2fb
Merge pull request #1561 from Raydiation/master
...
Moved the iframe height and width fix from js to css
2013-02-09 08:56:12 -08:00
Bernhard Posselt
62122148bf
Revert "moved iframe height and width fix from js to css"
...
This reverts commit 842fc85b9a
.
2013-02-09 17:46:23 +01:00
Bernhard Posselt
43981e62e2
Revert "added exe and msi filetypes and icon"
...
This reverts commit aa1adf42c7
.
2013-02-09 17:46:07 +01:00
Bernhard Posselt
aa1adf42c7
added exe and msi filetypes and icon
2013-02-09 17:41:17 +01:00
Bernhard Posselt
842fc85b9a
moved iframe height and width fix from js to css
2013-02-09 17:41:17 +01:00
Thomas Müller
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
Jan-Christoph Borchardt
79511f6d93
fixed database input group having two slightly thicker dividers
2013-02-09 17:14:20 +01:00
Jenkins for ownCloud
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
Frank Karlitschek
316807e0d3
Merge pull request #1624 from owncloud/singleselect
...
Split editable select code used for quota selection into a jquery plugin
2013-02-12 11:05:07 -08:00
Robin Appelman
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt
8ff20ac683
ellipsize infield labels when too long, specifically fix #871 for database labels on installation
2013-02-09 17:13:02 +01:00
Bart Visscher
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
Thomas Müller
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Thomas Müller
800609aaeb
Merge pull request #1545 from owncloud/fix-oc_webroot
...
fixup oc_webroot correctly before and after setup
2013-02-09 03:27:22 -08:00
Thomas Müller
c91334c54a
Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers
...
attach handlers to document instead of filelist
2013-02-09 03:23:19 -08:00
Bernhard Posselt
f8335c4815
moved iframe height and width fix from js to css
2013-02-09 11:34:25 +01:00
Frank Karlitschek
9bd45b26a5
add the buttons for the clients to the personal page.
...
Useful and prettier
2013-02-09 09:13:11 +01:00
raghunayyar
e8d17e4e8e
Personal Page Password Toggle Also Loads Well.
2013-02-09 11:40:07 +05:30
Jenkins for ownCloud
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
Thomas Müller
f42ac97045
Merge pull request #1547 from owncloud/navigation-color
...
brighter grey for the navigation bar
2013-02-08 13:30:25 -08:00
Jan-Christoph Borchardt
bebdd113f5
use proper HTML for other security warning too
2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt
c73f525050
brighter grey for the navigation bar, hopefully solves the weird similarity to the header
2013-02-08 19:33:22 +01:00
Bart Visscher
d5f98a82aa
fix-oc_webroot
2013-02-08 18:44:52 +01:00
Jan-Christoph Borchardt
a26e66b232
improve and shorten security warning, add link to docs, fix #1342
2013-02-08 13:38:50 +01:00
raghunayyar
eea4864c70
Removed whitespace from installation.php
2013-02-08 17:35:41 +05:30
raghunayyar
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
Jörn Friedrich Dreyer
43ffb5945c
attach handlers to document instead of filelist, minor whitespace cleanups
2013-02-08 11:05:56 +01:00
Jenkins for ownCloud
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
Tobias Ramforth
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
Lukas Reschke
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
Thomas Müller
867650ee47
Merge pull request #1529 from owncloud/installation-login-fixes
...
Installation login fixes
2013-02-07 13:40:25 -08:00
Lukas Reschke
c0154558c7
Merge pull request #1526 from owncloud/l10n-support-master
...
L10n support master
2013-02-07 12:38:36 -08:00
Bart Visscher
a82d18d2f8
Fill oc_webroot with the expected value
2013-02-07 21:13:57 +01:00
blizzz
fc7230349b
Merge pull request #1530 from owncloud/fix-warning-displayname-layout
...
Fix warning with displayname in user layout template
2013-02-07 11:25:33 -08:00
Jan-Christoph Borchardt
8ca730f4c1
make show password toggle work for installation (once #1525 is fixed)
2013-02-07 18:07:38 +01:00
Bart Visscher
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
Jan-Christoph Borchardt
32e739f2ae
make show password not specific to log in
2013-02-07 17:41:24 +01:00
Jan-Christoph Borchardt
ee6884e336
remove duplicate show password toggle code, move current one to proper location
2013-02-07 17:04:03 +01:00
Jan-Christoph Borchardt
ae7a80ede3
some comments for CSS documentation
2013-02-07 17:02:43 +01:00
Jan-Christoph Borchardt
867dc8e6dc
fix database labels having left padding
2013-02-07 16:57:54 +01:00
Thomas Mueller
5f92d269dc
l10n support enhanced in core
2013-02-07 16:49:36 +01:00
Thomas Mueller
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Bart Visscher
458ba4b55c
Fix disabling setup form on submit
2013-02-07 08:12:09 +01:00
Bart Visscher
c0b370f6cf
Define the variables that are expected to exist but won't be set in setup
2013-02-07 08:11:18 +01:00
Bart Visscher
149d079fd4
Move loading of js_config to templatelayout
...
Also check for installed flag because this isn't available before setup
2013-02-07 08:09:53 +01:00
Jenkins for ownCloud
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
Jan-Christoph Borchardt
4c406c9ab1
fix shorttag issue mentioned in #1357
2013-02-06 18:19:26 +01:00
Bart Visscher
3582f7bd09
Execute the post setup check after finishing the setup
2013-02-06 17:56:45 +01:00
Jan-Christoph Borchardt
2130262515
Merge pull request #1459 from owncloud/infield-detail
...
shift infield labels just a tiny bit to the right so the cursor doesn't ...
2013-02-06 08:23:53 -08:00
Thomas Tanghus
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
Thomas Tanghus
2d77c7c0fd
Reduce top position for content below controls.
2013-02-06 16:56:26 +01:00
Jan-Christoph Borchardt
09a4424b1f
Merge pull request #1497 from owncloud/collapse-usermenu
...
collapse user menu when inside one of the settings sections
2013-02-06 07:33:59 -08:00
Jan-Christoph Borchardt
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
Thomas Müller
efdaea4557
Merge pull request #1357 from owncloud/alternative-loging-master
...
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Jan-Christoph Borchardt
964ff88f71
move inline style to CSS file, fix details
2013-02-06 15:15:20 +01:00
Jan-Christoph Borchardt
9961235c7b
Merge pull request #1429 from owncloud/fix_addNavigation
...
Make app icon linkable when enabling app.
2013-02-05 05:47:14 -08:00
Jan-Christoph Borchardt
8ae1205b95
line up 'remember' text with checkbox
2013-02-05 12:49:33 +01:00
Jan-Christoph Borchardt
7eaa2d0de1
form detail on log in button, better shape
2013-02-05 12:48:30 +01:00
Jan-Christoph Borchardt
c47fcf7d22
shift infield labels just a tiny bit to the right so the cursor doesn't overlap
2013-02-05 12:30:23 +01:00
Jan-Christoph Borchardt
2ec0c491d4
remove superfluous enabled-app class again
2013-02-05 11:30:18 +01:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Thomas Tanghus
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
Thomas Müller
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Tanghus
bb9be6f629
Add box-sizing to controls.
2013-02-04 00:24:34 +01:00
Jenkins for ownCloud
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
Thomas Tanghus
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
Jan-Christoph Borchardt
b8e6b8692b
fix CSS to coding guideline
2013-02-03 12:24:24 +01:00
raghunayyar
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Jan-Christoph Borchardt
48022f4525
Merge pull request #1395 from raghunayyar/webkit-scrollbar-534
...
Adds webkit scrollbar to ownCloud
2013-02-01 10:26:23 -08:00
Jenkins for ownCloud
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
Robin Appelman
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
raghunayyar
0118606e09
More Visible webkit Scrollbar, syntax error solved.
2013-02-01 02:50:31 +05:30
Jan-Christoph Borchardt
45865b45c4
use translate string for Log out, remove title
2013-01-31 20:45:59 +01:00
Jan-Christoph Borchardt
6d560be564
fix svg fallback replacement for settings icons
2013-01-31 20:42:44 +01:00
Jan-Christoph Borchardt
3f3ae4a985
fix header for shared links
2013-01-31 20:19:32 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Thomas Müller
0dd9e6cb12
Merge pull request #1387 from schiesbn/visual_improvements
...
small visual improvements
2013-01-31 08:30:25 -08:00
raghunayyar
5605297387
Adds webkit scrollbar to ownCloud
2013-01-31 21:51:44 +05:30
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Björn Schießle
9cd692a6d0
use the same tooltip as for the password field
2013-01-31 17:00:05 +01:00
Jan-Christoph Borchardt
43f8bf8e5c
Merge pull request #1358 from owncloud/button-fix
...
increase opacity of buttons, fix for dark backgrounds like header in pub...
2013-01-31 06:40:14 -08:00
Jan-Christoph Borchardt
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
Jan-Christoph Borchardt
f0ca8eeba4
no box-shadow for public share download button
2013-01-31 15:21:50 +01:00
Jan-Christoph Borchardt
cbafea4cc8
increase opacity of inactive apps and settings entries for better visibility
2013-01-31 14:32:07 +01:00
Jan-Christoph Borchardt
1144b61db3
vertical scrollbar for app navigation when too many apps
2013-01-31 14:14:12 +01:00
Jan-Christoph Borchardt
90aa1b3532
ellipsize long app names in navigation
2013-01-31 14:04:33 +01:00
Jan-Christoph Borchardt
c801b86bc2
Merge pull request #1359 from raghunayyar/navigation
...
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
Jan-Christoph Borchardt
300ecc2ed2
change button box-shadow from hard white to slight transparent
2013-01-31 12:59:36 +01:00
Björn Schießle
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
Jenkins for ownCloud
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
Jan-Christoph Borchardt
228a181d48
use new user function to display real name if available, username still fallback
2013-01-30 18:35:53 +01:00
Jörn Friedrich Dreyer
d7823adb07
attach to filelist which is present on .ready()
2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
raghunayyar
0dfbd53a6e
Reduced Styling and Image loads as from src and not backgorund.
2013-01-30 19:12:51 +05:30
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Björn Schießle
9639544ca0
make background transparent
2013-01-30 12:56:22 +01:00
Jenkins for ownCloud
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle
d19de49606
prevent xss
2013-01-29 22:32:59 +01:00
raghunayyar
d620495e92
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-30 00:54:23 +05:30
Jan-Christoph Borchardt
e2f1a445ed
increase opacity of buttons, fix for dark backgrounds like header in public share, fix #1188
2013-01-29 19:13:39 +01:00
Thomas Mueller
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Björn Schießle
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
Michael Gapczynski
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Michael Gapczynski
ed2ee8c411
Change file action text for files inside shared folders as well
2013-01-28 23:16:29 -05:00
Michael Gapczynski
ede7fccb00
Change file action text to 'Shared'
2013-01-28 23:13:38 -05:00
Jenkins for ownCloud
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
Jan-Christoph Borchardt
a78ae6a5cb
Merge branch 'master' into permanent-share-icons
2013-01-28 19:39:51 +01:00
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
Jan-Christoph Borchardt
feb65c89f2
update Files icon from home to files, update Home icon from checkbox to home
2013-01-28 19:20:07 +01:00
Björn Schießle
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
Jan-Christoph Borchardt
aaac2414ea
undo padding change on buttons, otherwise it will mess up the upload and new buttons again
2013-01-28 13:16:30 +01:00
Jan-Christoph Borchardt
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Jenkins for ownCloud
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
Lukas Reschke
9e498b6548
Merge pull request #1326 from owncloud/event-source-token
...
Use global oc_requesttoken for Event Source
2013-01-26 15:18:23 -08:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
Michael Gapczynski
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
Michael Gapczynski
31ebea0f6a
Permanently display shared status icons
2013-01-26 13:25:15 -05:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Müller
3b547895ec
Merge pull request #1306 from owncloud/smart-app-banner
...
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
Lukas Reschke
d8c4e620af
Use black background images
2013-01-25 16:23:03 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
raghunayyar
aed204d420
Defined height for #leftcontent
2013-01-25 20:39:07 +05:30
Georg Ehrke
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
Thomas Tanghus
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
Lukas Reschke
ff4d62132a
This breaks the installation
...
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.
JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
Björn Schießle
e9a57e28fc
show display name instead of uid
2013-01-25 13:57:08 +01:00
raghunayyar
f7a0ab7d4f
Style fixes on core/navigation Branch.
...
#rightcontent margin and button overlaps fixed.
2013-01-25 16:01:41 +05:30
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Thomas Mueller
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
Lukas Reschke
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
Lukas Reschke
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Lukas Reschke
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
Lukas Reschke
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
Robin Appelman
8817b603d7
Fix scrolling of leftcontent
2013-01-21 18:29:18 +01:00
Lukas Reschke
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
Lukas Reschke
68025ac43c
Add a route to the JS config
2013-01-20 23:46:46 +01:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Lukas Reschke
8daefd00fb
Sanitize the exception
2013-01-19 19:57:17 +01:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Jan-Christoph Borchardt
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
Jan-Christoph Borchardt
09d3db5eb7
new settings menu for new design
2013-01-17 12:45:33 +07:00
Jan-Christoph Borchardt
de41813792
new app icon style for new design
2013-01-17 11:54:31 +07:00
Bernhard Posselt
b659072686
dont show horizontal scrollbar
2013-01-16 19:55:16 +01:00
Bernhard Posselt
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke
216a5af396
Remove uneeded file
...
logout.php is a legacy file, which isn't used anymore in the ownCloud
code.
2013-01-11 16:49:55 +01:00
Lukas Reschke
1eb3c8ecf6
Correct link to the bugtracker in exception.php
2013-01-11 16:42:06 +01:00
Thomas Mueller
7fe8fb4248
pin notification to the top
2013-01-11 15:21:39 +01:00
Thomas Mueller
c2b3c7ed3e
fixing text-align on navigation menu - closing div was missing - THX Lukas
2013-01-11 15:19:53 +01:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Thomas Mueller
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
Thomas Mueller
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
Michael Gapczynski
2012603b74
Merge branch 'master' into fix-issue-1085
2013-01-07 14:16:32 -05:00
Michael Gapczynski
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
Jörn Friedrich Dreyer
0dda8f5d1c
ie8 ignores rgba, show button border in ie8 by adding second border css row
2013-01-07 13:09:52 +01:00
Jörn Friedrich Dreyer
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
3dbb148567
Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields
...
remove css not selector - incompatible with ie8
2013-01-07 01:17:19 -08:00
Thomas Müller
7ca740fa3d
Merge pull request #632 from owncloud/fix_629
...
fix pattern for database names - #629
2013-01-06 14:03:02 -08:00
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Michael Gapczynski
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
Michael Gapczynski
5ea8adc7c7
Reformat long line
2013-01-05 12:21:57 -05:00
Michael Gapczynski
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
Michael Gapczynski
6b2216f0d6
Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
2013-01-05 11:09:48 -05:00
Michael Gapczynski
a94405b4e4
Only show the version updating to instead of worrying about converting internal to a formatted version
2013-01-04 20:13:00 -05:00
Jenkins for ownCloud
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
Thomas Müller
913c96ddc5
Merge pull request #1081 from owncloud/fix-issue-1075
...
Remove echo from lost password page
2013-01-04 10:17:25 -08:00
Michael Gapczynski
394cebc90f
Remove echo from lost password page
2013-01-04 11:12:28 -05:00
Michael Gapczynski
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
Jenkins for ownCloud
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
Michael Gapczynski
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
Jenkins for ownCloud
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
Jörn Friedrich Dreyer
e2f549f6d7
remove css not selector - incompatible with ie8
2013-01-02 18:01:33 +01:00
Jörn Friedrich Dreyer
fe4f056a23
use jQuery.parseJSON fallback for IE6/7/8
2013-01-02 17:13:23 +01:00
Jörn Friedrich Dreyer
4a7604daa2
remove , at end of js. IE8 chokes on this
2013-01-02 17:02:06 +01:00
Jörn Friedrich Dreyer
5b07e722cb
combine ie8 fix with debug check
2013-01-02 12:21:30 +01:00
Jörn Friedrich Dreyer
e998da06d1
fix broken console.log in ie8
2013-01-02 12:13:07 +01:00
Jenkins for ownCloud
c6064a542c
[tx-robot] updated from transifex
2013-01-01 00:04:42 +01:00
Jenkins for ownCloud
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
Jenkins for ownCloud
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
Jenkins for ownCloud
9aefbea074
[tx-robot] updated from transifex
2012-12-29 00:08:28 +01:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
Jenkins for ownCloud
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
Jenkins for ownCloud
b7257b2524
[tx-robot] updated from transifex
2012-12-26 00:12:10 +01:00
Jenkins for ownCloud
5d59ac0739
[tx-robot] updated from transifex
2012-12-25 00:11:11 +01:00
Jenkins for ownCloud
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
Jenkins for ownCloud
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
Jenkins for ownCloud
05fda76776
[tx-robot] updated from transifex
2012-12-22 00:26:25 +01:00
Thomas Tanghus
c317da7814
multiSelect: Add sorting options.
2012-12-21 06:18:10 +01:00
Thomas Tanghus
689edc2534
multiSelect: Make sure up/down classes are removed on close.
2012-12-21 06:17:13 +01:00
Thomas Tanghus
63fa943a52
multiSelect: Don't force popup above if there's no room for it there.
2012-12-21 00:53:23 +01:00
Thomas Tanghus
73b186cc60
Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_multiSelect
2012-12-21 00:52:29 +01:00
Jenkins for ownCloud
3e39c39d6a
[tx-robot] updated from transifex
2012-12-21 00:11:31 +01:00
Michael Gapczynski
84ba66e9b7
Merge pull request #978 from owncloud/logout-icon
...
fix logout icon, hopefully also #969
2012-12-20 14:51:36 -08:00
Jan-Christoph Borchardt
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt
1cbd04a2c4
fix logout icon, hopefully also #969
2012-12-20 13:49:43 +01:00
Thomas Müller
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
Jenkins for ownCloud
ecf82d2218
[tx-robot] updated from transifex
2012-12-20 00:13:09 +01:00
Frank Karlitschek
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
Thomas Müller
ad497d23ec
Merge pull request #949 from RandolfCarter/InvalidDefaultAddress
...
Fixing default email sender address
2012-12-19 00:33:53 -08:00
Randolph Carter
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
Jan-Christoph Borchardt
74b4fefda8
remove padding from header
2012-12-19 00:10:03 +01:00
Jenkins for ownCloud
982e46cd29
[tx-robot] updated from transifex
2012-12-19 00:04:14 +01:00
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
Björn Schießle
3adfb91ad8
call the password input field by name
2012-12-18 13:40:19 +01:00
Björn Schießle
d873f0da35
autofocus to password input after clicking the checkbox; code restructured; debug output added
2012-12-18 13:39:52 +01:00
Björn Schießle
c457e15b20
some more usability improvements:
...
merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
2012-12-18 13:39:37 +01:00
Björn Schießle
1dd79cc8e1
set password for shared links when the user press enter and when he leaves the password field
2012-12-18 13:39:09 +01:00
Jenkins for ownCloud
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
Georg Ehrke
bbe805b665
use regex which was suggested by dragotin
2012-12-17 12:28:34 +01:00
Jenkins for ownCloud
0c87f666ad
[tx-robot] updated from transifex
2012-12-16 00:12:10 +01:00
Bart Visscher
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
Jenkins for ownCloud
9f5868cf18
[tx-robot] updated from transifex
2012-12-15 00:12:10 +01:00
Frank Karlitschek
5689c78ee6
rename to doc
2012-12-14 14:39:05 +01:00
Frank Karlitschek
4b80e500a5
add pointer to the existing documentation. This will be replaced by the rel documentation during packaging
2012-12-14 14:38:22 +01:00
Frank Karlitschek
a871e300e2
Merge pull request #850 from owncloud/icons-for-login
...
Icons for login
2012-12-14 00:12:41 -08:00
Jenkins for ownCloud
6d7ae463df
[tx-robot] updated from transifex
2012-12-14 00:17:42 +01:00
Jan-Christoph Borchardt
0bc2dc24cd
remove transitions for file rows and actions because it made everything seem sluggish
2012-12-13 19:12:09 +01:00
Jan-Christoph Borchardt
2c41ae4372
small code reordering of inputs and buttons
2012-12-13 12:51:45 +01:00
Jan-Christoph Borchardt
7881bf1d4d
improve general button coloring
2012-12-13 12:49:59 +01:00
Frank Karlitschek
f85106b6b5
first version of the new documentation system integration.
2012-12-12 22:41:12 +01:00
Jan-Christoph Borchardt
9d8bdff51b
tweak icons for username and password fields, now it’s good
2012-12-12 22:40:08 +01:00
Thomas Müller
8b4aad73c7
Merge pull request #810 from owncloud/send-share-link-by-email
...
restoring feature to send sharing link via email
2012-12-12 04:54:51 -08:00
Thomas Mueller
c938a4f791
feedback to the user while request is being processed
2012-12-12 12:34:28 +01:00
Jenkins for ownCloud
bac4e011dc
[tx-robot] updated from transifex
2012-12-12 00:14:08 +01:00
Jan-Christoph Borchardt
90e8e94909
icons for username and password field, not sure if it’s good
2012-12-11 18:54:43 +01:00
Jan-Christoph Borchardt
b72a0f5680
remove obsolete CSS, fix database host label position
2012-12-11 13:02:45 +01:00
Thomas Mueller
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
Thomas Mueller
45074d5023
restoring feature to send sharing link via email
2012-12-10 18:41:08 +01:00
Jan-Christoph Borchardt
cb6c430321
add my install changes from #721 again after they have been reverted through #282
2012-12-10 15:08:58 +01:00
Jenkins for ownCloud
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
Thomas Müller
9a3a83e16a
Merge pull request #282 from butonic/fix_new_and_upload_button_html_css
...
fix_new_and_upload_button_html_css
2012-12-09 01:25:50 -08:00
Jenkins for ownCloud
e3e4dcf77b
[tx-robot] updated from transifex
2012-12-09 00:12:41 +01:00
Jenkins for ownCloud
2ca72d0da7
[tx-robot] updated from transifex
2012-12-08 00:10:53 +01:00
Jörn Friedrich Dreyer
787e8b86d9
cleanup CSS whitespace and remove extra input[type='checkbok']
2012-12-07 17:41:52 +01:00
Jörn Friedrich Dreyer
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
Bart Visscher
75367f91e0
Merge pull request #721 from owncloud/improve-installation-and-login
...
Improve installation and login
2012-12-07 05:30:30 -08:00
Bart Visscher
1e062ea895
Merge pull request #182 from owncloud/fix-redirect
...
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Jan-Christoph Borchardt
e989493eca
properly center data directory label
2012-12-06 16:44:48 +01:00
Jan-Christoph Borchardt
4f513f279a
fix dbhostlabel not disappearing, remove obsolete CSS
2012-12-06 16:41:06 +01:00
Jan-Christoph Borchardt
0fa59f8937
use vector logo also on log in page, d'oh (also now retina-ready)
2012-12-06 16:29:56 +01:00
Jan-Christoph Borchardt
2288b26305
fix missing feedback when tab-focusing on checkbox
2012-12-06 16:28:02 +01:00
Jenkins for ownCloud
69a9fe75a0
[tx-robot] updated from transifex
2012-12-06 00:12:08 +01:00
Thomas Müller
c487d9fc7e
Merge pull request #716 from eMerzh/remove_sqlite2
...
Remove support of sqlite2
2012-12-05 03:18:02 -08:00
Jan-Christoph Borchardt
b6fca70ee4
add primary action button in fitting subtle dark blue
2012-12-05 00:37:00 +01:00
Jan-Christoph Borchardt
56dae06528
move inline warning styles into CSS, clean up and fix #270
2012-12-05 00:25:58 +01:00
Jenkins for ownCloud
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
Jan-Christoph Borchardt
13e0287b74
better layout for installation page elements, centered and subdued legend text
2012-12-04 23:55:31 +01:00
Jan-Christoph Borchardt
5ccea4cc2f
small fixes: toggle color adjustment, remove colon, prevent label wrapping
2012-12-04 23:09:30 +01:00
Thomas Tanghus
6d643f9e74
multiSelect.js: Give each select a unique msid to prevent double adding in users.js
2012-12-04 21:21:54 +01:00
Brice Maron
4df61c3e45
Simplify has sqlite test
2012-12-04 19:34:24 +00:00
Brice Maron
e6ec0e8a5e
Remove support of sqlite2 at installation
2012-12-04 17:36:23 +00:00
Thomas Tanghus
8837f2a307
multiSelect: Added scrollbar if longer than 20em. Ref #720
2012-12-04 18:00:14 +01:00
Thomas Tanghus
feeaaf2d29
multiSelect: Make sure last added entry is selected and some code cleanup.
2012-12-04 18:00:14 +01:00
Thomas Tanghus
daf452b4ba
Added some missing type checks.
2012-12-04 18:00:13 +01:00
Thomas Tanghus
9ddd754bce
Enhanced multiSelect jquery plugin.
2012-12-04 18:00:13 +01:00
Jan-Christoph Borchardt
855a011697
group related input fields visually
2012-12-04 16:58:42 +01:00
Jörn Friedrich Dreyer
e72f95f643
merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay
2012-12-04 13:32:55 +01:00
Jörn Friedrich Dreyer
3e519945c3
replace minified infieldlabel with dcneiners version
2012-12-04 13:30:13 +01:00
Jenkins for ownCloud
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Bart Visscher
f820596825
Merge pull request #605 from owncloud/fix_false_positive_share_2
...
Sharing: Fix false positived v. 2
2012-11-30 04:02:18 -08:00
Georg Ehrke
a0fe53d09a
fix pattern for database names
2012-11-29 15:08:05 +01:00
Jenkins for ownCloud
6c3f43b061
[tx-robot] updated from transifex
2012-11-29 00:04:57 +01:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Thomas Tanghus
5c9faf396a
Sharing: Fix false positived v. 2
2012-11-27 23:01:26 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Jörn Friedrich Dreyer
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
Arthur Schiwon
4c707d1b1f
remove debug output
2012-11-26 14:35:02 +01:00
Arthur Schiwon
e5ad774ab0
coding style
2012-11-26 14:34:51 +01:00
Arthur Schiwon
4764876192
check whether to join url with ? or &
2012-11-26 14:34:41 +01:00
Arthur Schiwon
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
Jenkins for ownCloud
dde3342398
[tx-robot] updated from transifex
2012-11-24 00:03:00 +01:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Frank Karlitschek
19797ee7db
even error messages have the right to look a bit pretty
2012-11-23 14:22:57 +01:00
Jenkins for ownCloud
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
Jenkins for ownCloud
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Jenkins for ownCloud
c5e891008b
[tx-robot] updated from transifex
2012-11-19 00:01:48 +01:00
Jenkins for ownCloud
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
Thomas Müller
f3ae43d94a
Merge pull request #420 from libasys/bugfix-share
...
If you using the sharing by link the array monthNames don't exist and ca...
2012-11-17 14:47:24 -08:00
Thomas Müller
9e9bf20b07
Merge pull request #495 from owncloud/fix_issue_262
...
Fix lostpassword url generation
2012-11-17 02:09:40 -08:00
Jenkins for ownCloud
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
Bart Visscher
03b8ba273a
Fix lostpassword url generation
...
Fixes issue #262
2012-11-16 22:01:24 +01:00
Thomas Müller
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
Thomas Tanghus
b99213f7a7
Merge pull request #458 from owncloud/js_console_switch
...
Very simple js console switcher.
2012-11-15 15:05:47 -08:00
Jenkins for ownCloud
d86a368e54
[tx-robot] updated from transifex
2012-11-16 00:03:47 +01:00
Thomas Tanghus
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
Bernhard Posselt
defdbe3c10
removed unneeded callback checks in routes_request that could potentially fail
2012-11-15 15:07:01 +01:00
Bernhard Posselt
25e4a071ef
fixed: this.routes_request is a deferred/promise
2012-11-15 15:01:21 +01:00
Bernhard Posselt
bf20021b62
instead of warning via popup, write to console.warn
2012-11-15 14:48:18 +01:00
Bernhard Posselt
ad87bc4645
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-15 14:48:18 +01:00
Jenkins for ownCloud
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
Bernhard Posselt
14d4af24a2
Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading"
...
This reverts commit 9b8375cf2c
.
2012-11-14 23:09:15 +01:00
Bernhard Posselt
9b8375cf2c
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-14 22:37:21 +01:00
libasys
493ae19bca
If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined!
2012-11-14 16:47:52 +01:00
Thomas Müller
49f05dfade
Merge pull request #402 from zimba12/master
...
Uncomment hours entries in relative date functions
2012-11-14 05:36:04 -08:00
Thomas Müller
e06513d76b
Fixing syntax error - closes #406
2012-11-14 11:17:21 +01:00
Thomas Müller
99af3433d1
Fixing syntax error - closes #406
2012-11-14 11:10:31 +01:00
Alessandro Cosentino
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
Thomas Tanghus
c353568ea0
Merge pull request #41 from owncloud/vcategories_db
...
OC_VCategories - this time actually usable ;)
2012-11-13 15:40:46 -08:00
Jenkins for ownCloud
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
Thomas Tanghus
34a7e81ffb
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-13 12:10:49 +01:00
Bart Visscher
ad85087fcc
Use util function to protect datadirectory in setup
2012-11-13 08:54:19 +01:00
Jenkins for ownCloud
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
Thomas Tanghus
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
Bart Visscher
7b53c9d3f0
Merge pull request #157 from owncloud/setup
...
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus
fd709fc021
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-11 20:20:09 +01:00
Jenkins for ownCloud
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Jenkins for ownCloud
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Jenkins for ownCloud
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
Thomas Tanghus
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
Alessandro Cosentino
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
Jörn Friedrich Dreyer
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
Thomas Müller
8f0269f121
Merge pull request #265 from owncloud/fix-button-img-cursor
...
make images in buttons also show click-hand on hover
2012-11-05 15:15:56 -08:00
Thomas Tanghus
73d59bd397
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-06 00:10:45 +01:00
Jenkins for ownCloud
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
Jan-Christoph Borchardt
1aec5378b8
make images in buttons also show click-hand on hover
2012-11-05 19:54:48 +01:00
Thomas Tanghus
be77d81152
VCategories: Closing brace must be on a line by itself.
2012-11-05 16:38:23 +01:00
Thomas Tanghus
8c492a86fc
VCategories: Line too long.
2012-11-05 16:35:25 +01:00
Thomas Tanghus
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
Jan-Christoph Borchardt
b05666219e
Merge branch 'master' into navigation
2012-11-02 13:36:01 +01:00
Jenkins for ownCloud
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
Jan-Christoph Borchardt
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
Thomas Tanghus
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +01:00
Thomas Tanghus
290d0714df
Add routes for vcategory favorites.
2012-11-01 03:05:48 +01:00
Jenkins for ownCloud
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
Lukas Reschke
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
Jan-Christoph Borchardt
f50c043cfb
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-31 18:52:13 +01:00
Lukas Reschke
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Tanghus
3813ee78c3
Merge pull request #112 from libasys/Fix-strange-Isue-IE8
...
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
2012-10-31 06:16:13 -07:00
libasys
b095e32227
UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample
2012-10-31 09:42:26 +01:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Bart Visscher
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
Jan-Christoph Borchardt
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Bart Visscher
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
Bart Visscher
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
Bart Visscher
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
Bernhard Posselt
c4b8bb1041
added old functions again to not break apps, but show a deprecation warning
2012-10-29 01:14:07 +01:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Michael Gapczynski
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04:00
Michael Gapczynski
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
Jan-Christoph Borchardt
db5e8f3eea
enable hover state, now that needs to be added to the other icons
2012-10-28 17:22:18 +01:00
Jan-Christoph Borchardt
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
Jan-Christoph Borchardt
99ba05e766
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-28 16:48:30 +01:00
Jan-Christoph Borchardt
71435ac1cc
improve user menu
2012-10-28 16:47:25 +01:00
Jan-Christoph Borchardt
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
Björn Schießle
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
Georg Ehrke
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
Jan-Christoph Borchardt
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
Robin Appelman
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
Lukas Reschke
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
Lukas Reschke
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
.
2012-10-28 10:21:06 +01:00
Lukas Reschke
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Michael Gapczynski
fefc4e1707
Load all apps in core share ajax file for apps to register their share backends
2012-10-27 17:25:10 -04:00
Bernhard Posselt
a6f3a570c6
dont resize content div with javascript but use css box-sizing to do it
2012-10-27 19:42:25 +02:00
Jan-Christoph Borchardt
fc280b2887
first move of settings to top right
2012-10-27 18:58:16 +02:00
Bart Visscher
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
Jan-Christoph Borchardt
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
Bart Visscher
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Jan-Christoph Borchardt
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
Jan-Christoph Borchardt
46871e9b2e
update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin
2012-10-26 21:47:05 +02:00
Thomas Müller
628c7ca9cf
closes #113
2012-10-26 21:18:03 +02:00
libasys
0cf1fef3fa
Fix for problems using for() function instead of $.each for arrays with IE8
2012-10-26 20:34:04 +02:00
Robin Appelman
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Thomas Tanghus
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
Lukas Reschke
ec613b589b
Fix not defined JS variables
2012-10-25 17:51:59 +02:00
Jenkins for ownCloud
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
Thomas Tanghus
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
Lukas Reschke
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
Jenkins for ownCloud
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
Lukas Reschke
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
Lukas Reschke
9185cd5dae
Remove uneeded vendor prefixes
2012-10-24 00:01:18 +02:00
Lukas Reschke
9c17aa41ed
Format CSS in a readable way
2012-10-24 00:00:58 +02:00
Lukas Reschke
4956380a89
Remove uneeded vendor prefixes
2012-10-23 23:56:15 +02:00
Lukas Reschke
dcb286855e
Format the CSS in a readable way...
2012-10-23 23:55:59 +02:00
Lukas Reschke
787994139b
Remove uneeded vendor prefixes
2012-10-23 23:55:17 +02:00
Lukas Reschke
badda69b89
Format the CSS in a readable way...
2012-10-23 23:54:39 +02:00
Lukas Reschke
b1150f6a7f
Urlencode the share URL
...
Fixes #63
2012-10-23 17:55:49 +02:00
Lukas Reschke
b66dd3ebef
Merge pull request #38 from scambra/datepicker-l10n
...
Translate Datepicker
2012-10-22 23:53:24 -07:00
Felix Moeller
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Thomas Tanghus
befdd6b63b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-23 06:23:03 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Thomas Tanghus
69cf89c5f6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-22 15:41:39 +02:00
Thomas Tanghus
273fdb7b64
Added type and callback arguments to most methods.
2012-10-22 15:40:08 +02:00
Jenkins for ownCloud
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Michael Gapczynski
699a484f42
Fix font family for textarea
2012-10-20 14:15:33 -04:00
Michael Gapczynski
dd58849aa0
Apply textbox CSS rules to textarea as well
2012-10-20 14:11:35 -04:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
scambra
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
Thomas Tanghus
03ff614265
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 02:27:04 +02:00
Thomas Tanghus
fdf3ec1027
Add wait state to category dialog while processing.
2012-10-19 02:25:39 +02:00
Thomas Tanghus
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
Jenkins for ownCloud
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
Thomas Tanghus
81536a81e3
More js updates for app/type in OCCategories
2012-10-19 00:39:09 +02:00
Thomas Tanghus
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +02:00
Thomas Tanghus
3b6cfe4977
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 00:17:28 +02:00
Thomas Tanghus
97c884c548
Updated category js for handling favorites and use post instead of get.
2012-10-19 00:09:07 +02:00
Thomas Tanghus
26719005a4
Added ajax files for favorite category handling.
2012-10-19 00:07:41 +02:00
Thomas Tanghus
f4fd4a5a52
Updated category ajax files to use type instead of app and add callCheck.
2012-10-19 00:06:18 +02:00
Thomas Müller
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jenkins for ownCloud
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
Thomas Müller
9f01cd05fb
Merge pull request #37 from scambra/js-interpolation-l10n
...
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Bart Visscher
a8d0f84829
Resetting the password should also invalidate the token login cookies
2012-10-17 17:26:12 +02:00
Bart Visscher
0a614429af
Change the lostpassword flow to a controller
2012-10-17 17:24:49 +02:00