f3c06ae4e4
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
...
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
3ab97312b8
Hint to default data directory
...
not to before submitted data directory.
Thanks to bartv2 for the heads up.
2013-04-16 09:54:34 +02:00
d0b3e8aceb
[tx-robot] updated from transifex
2013-04-16 02:17:30 +02:00
c829a9c156
Merge pull request #2934 from owncloud/shorten_css_colorcodes
...
Shorten CSS colorcodes
2013-04-15 14:46:51 -07:00
3f7643ef46
Merge pull request #2769 from owncloud/octemplate
...
Add octemplate jQuery plugin
2013-04-15 13:42:35 -07:00
155582ab70
Updated docs.
2013-04-15 22:10:29 +02:00
0f86ed3ad5
Shorten CSS colorcodes
...
Only need to be three digits.
2013-04-15 21:07:45 +02:00
19526c9cf6
also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly
2013-04-15 20:29:45 +02:00
e13e4c412f
[tx-robot] updated from transifex
2013-04-15 02:12:43 +02:00
846f77ed92
additional comments
2013-04-14 19:30:16 +02:00
694c080dd2
fix navigation hover effect, documentation
2013-04-14 19:25:46 +02:00
d759dca203
Handle empty datafolder better.
...
If datafolder is erased, the default value will be shown as a placeholder.
If installation is submitted without a datafolder the default value will be used.
2013-04-13 15:56:01 +02:00
210bec0d31
Merge pull request #2910 from owncloud/password-toggle-db-2
...
Implements Toggle for Database Password.
2013-04-13 06:10:41 -07:00
c6dbb33e15
Fix textfield label overlapping value.
2013-04-13 14:48:16 +02:00
1871f43a52
Add shellscript for optimization.
2013-04-13 10:40:46 +02:00
618c9152e8
Merge pull request #2903 from owncloud/disabled-class
...
add .disabled class so it can be used for simple a buttons as well
2013-04-12 21:20:58 -07:00
59be6a910c
Implements Toggle for Database Password.
2013-04-13 09:45:30 +05:30
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
c9c83c6185
add .disabled class so it can be used for simple a buttons as well
2013-04-12 19:18:11 +02:00
448a390486
Optimize svgs with scour.
2013-04-12 19:06:29 +02:00
a56dc4bc94
dont overwrite background image when hovering over button
2013-04-12 14:30:16 +02:00
2e04a35277
use proper sans-serif font-stack
2013-04-11 17:20:24 +02:00
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
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
da882b1320
The Opacity for the navigation loads fine for icon and App name.
2013-04-10 19:30:28 +05:30
000a568b4a
Long Application Names are ellipsis correctly.
2013-04-10 19:14:50 +05:30
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
51e07a90b7
Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
...
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
f9b77e392c
Suppress the notice from the nullbyte check
2013-04-09 21:11:44 +02:00
5f89812a9b
Fix #2730
...
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
e44cc8ea57
Fix OC.dialogs.form()
...
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
27d8337728
Merge pull request #2697 from owncloud/button-css-fixes
...
Button css fixes
2013-04-09 03:04:34 -07:00
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
9c53f35d9a
Remove manual mimetype checking.
2013-04-08 23:00:02 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
38941a61bf
turn off autocompletion for password field
...
refs #2632
2013-04-07 21:51:10 +02:00
f59aedff4f
Optimize pictures with optipng.
2013-04-07 20:09:25 +02:00
870b73ce5a
Add octemplate jQuery plugin
2013-04-06 23:24:43 +02:00
75af38c1bd
Move compatibility functions to compatibility.js and add two more.
2013-04-06 22:37:15 +02:00
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
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
d556e7fbc0
Make files selectable again.
2013-04-06 17:22:55 +02:00
3e185911f1
Fix repeating directory names.
...
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
fba6681f71
Make directories show at top.
2013-04-06 14:42:56 +02:00
6231e5be39
Make directories clickable.
...
A bit bugged though ...
2013-04-06 14:17:47 +02:00
1919acd68f
Small fixes
...
* escapeHTML(everything)
* curly braces for if
* camelcase function_to_call
* add missing semicolae (?)
2013-04-06 12:16:55 +02:00
0be80abe70
Refactor OCdialogs.
...
Fix #2557 and make the whole code more usable.
2013-04-06 10:07:12 +02:00
5525fade11
Merge pull request #2737 from Kondou-ger/proper_css_comments
...
Proper CSS comment
2013-04-05 07:58:00 -07:00
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
69105fce00
Proper CSS comment
...
CSS comments don't work like that.
2013-04-05 01:17:52 +02:00
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
cd079e3421
group some selectors again
2013-04-03 20:06:26 +02:00
a35d869e15
add styles for disabled input fields
2013-04-03 18:45:03 +02:00
1c55b3a969
button selector cleanup
2013-04-03 17:55:31 +02:00
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
e25c1f3130
port 22c8194cc8
2013-04-02 21:03:13 +02:00
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
c94580ba29
revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal
2013-04-02 11:52:57 +02:00
29d33ff7c2
[tx-robot] updated from transifex
2013-04-02 00:04:27 +02:00
9e29d2845a
[tx-robot] updated from transifex
2013-04-01 00:04:02 +02:00
ab40634f33
Merge pull request #2622 from Kondou-ger/add_missing_backticks
...
Add (two) missing backticks.
2013-03-30 18:53:22 -07:00
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
7f74f08808
Add missing backticks.
...
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
86ac30c596
Merge pull request #2516 from kabum/master
...
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
7098bcd4b7
[tx-robot] updated from transifex
2013-03-28 00:03:44 +01:00
c51396551d
Whitespaces
2013-03-27 22:55:17 +01:00
3af61a0a7c
Share Dialog: show Displayname instead of internal name
2013-03-27 22:55:05 +01:00
18554059a4
Remove Debug output
2013-03-27 19:12:53 +01:00
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
994a8797e4
remove extra type selector qualification for ID and class names
2013-03-27 17:39:09 +01:00
0b1dc7b0cc
also use SVG for settings cog
2013-03-27 17:33:25 +01:00
5aa1ca5882
use SVG for folder image
2013-03-27 17:32:37 +01:00
bcf1b6f9f8
soften highlight for navigation entries
2013-03-27 17:11:40 +01:00
e167ccc5c6
modify app styles to adhere to coming CSS coding guidelines
2013-03-27 16:14:17 +01:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
8d7aa42b9a
Removes the setTimeout() method.
2013-03-26 23:32:26 +05:30
25a8690318
Fixes autofill for display / hide toggle button, a better function name.
2013-03-25 16:09:35 +05:30
d9cd9875e0
Initial Commit : Password Toggle Button hides if no input present
2013-03-25 04:30:09 +05:30
c022dbe5c8
added %webroot% instead of relative path
2013-03-23 00:37:31 +01:00
bee9f7ebc6
also make bottom border grey on first level hover
2013-03-23 00:35:18 +01:00
adaf1d1959
small fixes
2013-03-23 00:35:18 +01:00
5d3e3a0a75
added app stylings to core
2013-03-23 00:35:18 +01:00
4f6e13e673
[tx-robot] updated from transifex
2013-03-23 00:06:16 +01:00
79d99b9c96
use simple markup to highlight groups in share autocomplete
2013-03-22 10:00:43 +01:00
8871629db5
replace hardcoded css style with css class - ref owncloud/core#173
2013-03-21 23:19:59 +01:00
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
43b928aca6
Fixed typo
2013-03-21 18:46:59 +01:00
55fc03fda4
No Scrolling for more than approximately 10 Applications
2013-03-21 18:37:23 +01:00
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
3b1c7de459
[tx-robot] updated from transifex
2013-03-21 00:04:36 +01:00
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
dc41cf081c
Check if the installed PHP version has a fix for the nullbyte vulnerability
2013-03-20 08:43:54 +01:00
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
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
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
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
761540e78b
Merge pull request #2320 from ceri/master
...
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
8154b4be7d
use display name as sender for private link mails, approved in #2294
2013-03-14 13:26:20 +01:00
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
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
1e20067c00
Merge pull request #2183 from owncloud/fix-shared-statuses-again
...
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
9ad03b61a3
Update share.js
...
Added HTML escaping
2013-03-08 17:29:05 +01:00
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
0aa6c1b163
fixed header content padding
2013-03-07 19:28:17 +01:00
19073e0711
Merge pull request #2167 from owncloud/input-type-fix
...
Input type fix
2013-03-07 07:28:22 -08:00
a2aebbd742
Merge pull request #2130 from owncloud/fix_2128
...
fix #2128
2013-03-06 05:05:40 -08:00
a83a5aa900
fix #2128
2013-03-06 13:02:44 +01:00
630ee644db
Don't sanitize error message hint
2013-03-06 12:56:27 +01:00
114c6457a3
add email input type to styled inputs, fix #2097
2013-03-06 12:38:43 +01:00
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
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
07dee24cb2
explicitly add empty placeholder to inputs which use infield labels, fix #2049
2013-03-04 22:11:57 +01:00
e9f46a7452
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 16:36:49 +01:00
841daf4845
Merge pull request #2062 from owncloud/shareType
...
Sanitize shareWith
2013-03-03 16:27:51 -08:00
577945bd33
Sanitize shareWith
2013-03-04 00:54:21 +01:00
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
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
9cb5bf0a28
add ie css switch to layout templates
2013-03-03 13:57:20 +01:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
620ddd3baa
new Array() -> []
2013-03-02 19:24:37 +01:00
22424e8abc
update OC.Notification.show
2013-03-02 17:36:04 +01:00
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
2af3bc3e77
Merge pull request #2022 from owncloud/fix-notice
...
Fix notice
2013-03-01 23:39:27 -08:00
630483c75d
Fix notice
2013-03-02 00:53:53 +01:00
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
294403fa99
The router base url is without / on the end
2013-02-28 18:02:26 +01:00
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
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
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
39e28c0170
Typo...
2013-02-27 23:19:38 +01:00
6f14bec70a
Add a missing )
2013-02-27 23:15:18 +01:00
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
40e51d13d2
Remove uneeded file
2013-02-27 22:35:37 +01:00
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
e01ab04d2b
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 17:57:53 +01:00
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
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
0828bb7e0e
Merge pull request #1957 from owncloud/fix-895
...
Fix 895
2013-02-27 03:10:29 -08:00
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
a5d84b74d0
properly align triangle and unshare icons to text, also fixes line hopping
2013-02-27 11:30:33 +01:00
7ee5b2df13
fix ugly giant triangles
2013-02-27 11:30:06 +01:00
49cd9f20a6
fix shared by text going out of box, fix #895
2013-02-27 11:22:13 +01:00
f36d92bbc1
Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
...
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
86ffa28f72
quick fix for log in button not being aligned with input fields
2013-02-27 11:04:08 +01:00
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
aa8bf3bbaa
Merge pull request #1941 from owncloud/session_heartbeat
...
generate url only once for heartbeat
2013-02-26 11:49:59 -08:00
a65b16f3e7
generate url only once
2013-02-26 20:45:25 +01:00
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
81bb4363a2
use 15 min instead of 15 sec timeout
2013-02-26 20:25:07 +01:00
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
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
6f09f57008
remove more unused logo files, now in promo
2013-02-26 14:28:17 +01:00
7a47786afd
align logo type pixel perfectly
2013-02-26 14:27:29 +01:00
69eb69be0e
Merge pull request #1902 from owncloud/angularcsp
...
add CSP turned on for angularjs
2013-02-26 00:58:12 -08:00
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
5b732ac1ea
Move space
2013-02-25 20:52:01 -05:00
aa2ea9e3de
Fix adding share icons to share action
2013-02-25 20:20:29 -05:00
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
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
b537cecdf3
add CSP turned on for angularjs
2013-02-25 22:54:05 +01:00
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
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
c111a3aa24
add span tag to displayname on expand button
2013-02-25 15:40:57 -05:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
6aa0ecc9b8
[tx-robot] updated from transifex
2013-02-23 00:05:33 +01:00
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
e7d1bbfae3
fix giant advanced caret in installation
2013-02-21 18:20:14 +01:00
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
eceb7341bb
make number-input fields look like they should
2013-02-21 16:25:47 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
4f4e81d3d2
Add message when trouble sending email ref #1799
2013-02-20 21:14:55 +01:00
6ecc3d7ee1
Reduced email input width by 10% to increase space.
2013-02-20 23:08:21 +05:30
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
326aae8a08
Hovering on the unshare doesnt spoil look
2013-02-20 21:59:12 +05:30
d8e8dab006
Fixes the Email Button and the email input Width.
2013-02-20 21:37:23 +05:30
170a5856e9
Merge branch 'sharing-css-fix' into sharing-dropdown-fixes
2013-02-20 21:25:18 +05:30
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
0efa4182dc
Update office icons
2013-02-20 10:42:54 +01:00
a085e4c435
Merge pull request #1720 from owncloud/usermenu-css
...
fix erroneous CSS, remove obsolete selectors
2013-02-19 10:44:58 -08:00
d82c9fd623
Text stays inside the sharing dropdown
2013-02-19 15:12:35 +05:30
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
5a8e0f2048
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-16 19:56:56 +01:00
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
953c87db9c
fix erroneous CSS, remove obsolete selectors
2013-02-15 18:37:52 +01:00
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
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
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
4320f23c87
Merge pull request #1702 from owncloud/remove-images
...
remove unused images to lessen packaged size
2013-02-14 12:46:40 -08:00
29bf3552a2
Merge pull request #1703 from owncloud/firstrunwizard-icons
...
Firstrunwizard icons
2013-02-14 12:41:23 -08:00
5624f1b838
Merge pull request #1701 from owncloud/XSS-fixes
...
Sanitize HTML
2013-02-14 10:50:46 -08:00
5b20c30889
pixel align dark calendar and contacts icons
2013-02-14 18:52:32 +01:00
6adaf67f35
add dark calendar and contacts icon for firstrunwizard and others
2013-02-14 18:45:24 +01:00
bb52271d22
exchange bright caret with dark triangle
2013-02-14 18:22:45 +01:00
a410529b15
remove unused images to lessen packaged size
2013-02-14 18:20:53 +01:00
c7094197bf
Sanitize HTML
2013-02-14 18:15:14 +01:00
db30f94fc8
Merge pull request #1697 from owncloud/navigation-details
...
Navigation details
2013-02-14 08:39:17 -08:00
3f09cc139f
double speed for user menu slide
2013-02-14 17:13:50 +01:00
95575a7fd1
simplify noise (immense file size reduction), also apply to user menu and header, fix #1576
2013-02-14 17:06:08 +01:00
1edfe874f5
only style text, password and search inputs like inputs, instead of using unsupported :not selector
2013-02-14 15:53:36 +01:00
53a3a307e8
no ugly border around checkboxes or radio buttons
2013-02-14 15:47:14 +01:00
e643742eb3
adding prototype trim as fallback for IE8
2013-02-14 12:59:26 +01:00
8065c73339
fixing eventsource.js for IE8
2013-02-14 12:20:22 +01:00
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
f9a6ed6c73
fix navigation icons SVG replacement, also hover and active opacity for IE
2013-02-14 10:59:30 +01:00
09d9138f84
fix caret on installation page for IE
2013-02-14 10:58:05 +01:00
7d8898065e
only show navigation scrollbar on hover, when needed, to be less obtrusive
2013-02-14 09:58:31 +01:00
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
6d7e324f4b
Merge pull request #1574 from owncloud/installation-label-overflow
...
Installation label overflow, fix #871
2013-02-13 07:55:05 -08:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
ed1c943f61
Makes password toggle button inside input.
2013-02-12 16:52:38 +05:30
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
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
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
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
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
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
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
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
c5e17e099a
split close and delete icon, add red hover for delete
2013-02-10 18:31:33 +01:00
0c4487d292
add big white icons for lightbox, slideshow etc
2013-02-10 18:06:18 +01:00
45a4016878
Merge pull request #1552 from raghunayyar/personalpage-style-fix
...
Personal Page Password Toggle Loads Fine.
2013-02-10 07:31:05 -08:00
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
1ba44a3325
Merge pull request #1538 from raghunayyar/admin-password-toggle
...
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
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
0664b98b4f
added icons and mimetypes for .msi and .exe files
2013-02-09 18:09:03 +01:00
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
62122148bf
Revert "moved iframe height and width fix from js to css"
...
This reverts commit 842fc85b9a
2013-02-09 17:46:23 +01:00
43981e62e2
Revert "added exe and msi filetypes and icon"
...
This reverts commit aa1adf42c7
2013-02-09 17:46:07 +01:00
aa1adf42c7
added exe and msi filetypes and icon
2013-02-09 17:41:17 +01:00
842fc85b9a
moved iframe height and width fix from js to css
2013-02-09 17:41:17 +01:00
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
79511f6d93
fixed database input group having two slightly thicker dividers
2013-02-09 17:14:20 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
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
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01:00
8ff20ac683
ellipsize infield labels when too long, specifically fix #871 for database labels on installation
2013-02-09 17:13:02 +01:00
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
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
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
f8335c4815
moved iframe height and width fix from js to css
2013-02-09 11:34:25 +01:00
9bd45b26a5
add the buttons for the clients to the personal page.
...
Useful and prettier
2013-02-09 09:13:11 +01:00
e8d17e4e8e
Personal Page Password Toggle Also Loads Well.
2013-02-09 11:40:07 +05:30
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
f42ac97045
Merge pull request #1547 from owncloud/navigation-color
...
brighter grey for the navigation bar
2013-02-08 13:30:25 -08:00
bebdd113f5
use proper HTML for other security warning too
2013-02-08 19:59:42 +01:00
c73f525050
brighter grey for the navigation bar, hopefully solves the weird similarity to the header
2013-02-08 19:33:22 +01:00
d5f98a82aa
fix-oc_webroot
2013-02-08 18:44:52 +01:00
a26e66b232
improve and shorten security warning, add link to docs, fix #1342
2013-02-08 13:38:50 +01:00
eea4864c70
Removed whitespace from installation.php
2013-02-08 17:35:41 +05:30
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
43ffb5945c
attach handlers to document instead of filelist, minor whitespace cleanups
2013-02-08 11:05:56 +01:00
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
867650ee47
Merge pull request #1529 from owncloud/installation-login-fixes
...
Installation login fixes
2013-02-07 13:40:25 -08:00
c0154558c7
Merge pull request #1526 from owncloud/l10n-support-master
...
L10n support master
2013-02-07 12:38:36 -08:00
a82d18d2f8
Fill oc_webroot with the expected value
2013-02-07 21:13:57 +01:00
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
8ca730f4c1
make show password toggle work for installation (once #1525 is fixed)
2013-02-07 18:07:38 +01:00
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
32e739f2ae
make show password not specific to log in
2013-02-07 17:41:24 +01:00
ee6884e336
remove duplicate show password toggle code, move current one to proper location
2013-02-07 17:04:03 +01:00
ae7a80ede3
some comments for CSS documentation
2013-02-07 17:02:43 +01:00
867dc8e6dc
fix database labels having left padding
2013-02-07 16:57:54 +01:00
5f92d269dc
l10n support enhanced in core
2013-02-07 16:49:36 +01:00
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
458ba4b55c
Fix disabling setup form on submit
2013-02-07 08:12:09 +01:00
c0b370f6cf
Define the variables that are expected to exist but won't be set in setup
2013-02-07 08:11:18 +01:00
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
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
4c406c9ab1
fix shorttag issue mentioned in #1357
2013-02-06 18:19:26 +01:00
3582f7bd09
Execute the post setup check after finishing the setup
2013-02-06 17:56:45 +01:00
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
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
2d77c7c0fd
Reduce top position for content below controls.
2013-02-06 16:56:26 +01:00
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
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
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
964ff88f71
move inline style to CSS file, fix details
2013-02-06 15:15:20 +01:00
9961235c7b
Merge pull request #1429 from owncloud/fix_addNavigation
...
Make app icon linkable when enabling app.
2013-02-05 05:47:14 -08:00
8ae1205b95
line up 'remember' text with checkbox
2013-02-05 12:49:33 +01:00
7eaa2d0de1
form detail on log in button, better shape
2013-02-05 12:48:30 +01:00
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
2ec0c491d4
remove superfluous enabled-app class again
2013-02-05 11:30:18 +01:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
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
bb9be6f629
Add box-sizing to controls.
2013-02-04 00:24:34 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
b8e6b8692b
fix CSS to coding guideline
2013-02-03 12:24:24 +01:00
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
48022f4525
Merge pull request #1395 from raghunayyar/webkit-scrollbar-534
...
Adds webkit scrollbar to ownCloud
2013-02-01 10:26:23 -08:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
0118606e09
More Visible webkit Scrollbar, syntax error solved.
2013-02-01 02:50:31 +05:30
45865b45c4
use translate string for Log out, remove title
2013-01-31 20:45:59 +01:00
6d560be564
fix svg fallback replacement for settings icons
2013-01-31 20:42:44 +01:00
3f3ae4a985
fix header for shared links
2013-01-31 20:19:32 +01:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
0dd9e6cb12
Merge pull request #1387 from schiesbn/visual_improvements
...
small visual improvements
2013-01-31 08:30:25 -08:00
5605297387
Adds webkit scrollbar to ownCloud
2013-01-31 21:51:44 +05:30
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
9cd692a6d0
use the same tooltip as for the password field
2013-01-31 17:00:05 +01:00
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
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
f0ca8eeba4
no box-shadow for public share download button
2013-01-31 15:21:50 +01:00
cbafea4cc8
increase opacity of inactive apps and settings entries for better visibility
2013-01-31 14:32:07 +01:00
1144b61db3
vertical scrollbar for app navigation when too many apps
2013-01-31 14:14:12 +01:00
90aa1b3532
ellipsize long app names in navigation
2013-01-31 14:04:33 +01:00
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
300ecc2ed2
change button box-shadow from hard white to slight transparent
2013-01-31 12:59:36 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
228a181d48
use new user function to display real name if available, username still fallback
2013-01-30 18:35:53 +01:00
d7823adb07
attach to filelist which is present on .ready()
2013-01-30 17:46:33 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
0dfbd53a6e
Reduced Styling and Image loads as from src and not backgorund.
2013-01-30 19:12:51 +05:30
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
9639544ca0
make background transparent
2013-01-30 12:56:22 +01:00
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
d19de49606
prevent xss
2013-01-29 22:32:59 +01:00
d620495e92
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-30 00:54:23 +05:30
e2f1a445ed
increase opacity of buttons, fix for dark backgrounds like header in public share, fix #1188
2013-01-29 19:13:39 +01:00
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
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
ed2ee8c411
Change file action text for files inside shared folders as well
2013-01-28 23:16:29 -05:00
ede7fccb00
Change file action text to 'Shared'
2013-01-28 23:13:38 -05:00
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
a78ae6a5cb
Merge branch 'master' into permanent-share-icons
2013-01-28 19:39:51 +01:00
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
feb65c89f2
update Files icon from home to files, update Home icon from checkbox to home
2013-01-28 19:20:07 +01:00
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
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
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
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
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
31ebea0f6a
Permanently display shared status icons
2013-01-26 13:25:15 -05:00
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
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
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
d8c4e620af
Use black background images
2013-01-25 16:23:03 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
aed204d420
Defined height for #leftcontent
2013-01-25 20:39:07 +05:30
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
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
e9a57e28fc
show display name instead of uid
2013-01-25 13:57:08 +01:00
f7a0ab7d4f
Style fixes on core/navigation Branch.
...
#rightcontent margin and button overlaps fixed.
2013-01-25 16:01:41 +05:30
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
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
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
8817b603d7
Fix scrolling of leftcontent
2013-01-21 18:29:18 +01:00
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
68025ac43c
Add a route to the JS config
2013-01-20 23:46:46 +01:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
8daefd00fb
Sanitize the exception
2013-01-19 19:57:17 +01:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
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
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
09d3db5eb7
new settings menu for new design
2013-01-17 12:45:33 +07:00
de41813792
new app icon style for new design
2013-01-17 11:54:31 +07:00
b659072686
dont show horizontal scrollbar
2013-01-16 19:55:16 +01:00
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
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
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
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
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
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
1eb3c8ecf6
Correct link to the bugtracker in exception.php
2013-01-11 16:42:06 +01:00
7fe8fb4248
pin notification to the top
2013-01-11 15:21:39 +01:00
c2b3c7ed3e
fixing text-align on navigation menu - closing div was missing - THX Lukas
2013-01-11 15:19:53 +01:00
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
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
2012603b74
Merge branch 'master' into fix-issue-1085
2013-01-07 14:16:32 -05:00
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
0dda8f5d1c
ie8 ignores rgba, show button border in ie8 by adding second border css row
2013-01-07 13:09:52 +01:00
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
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
7ca740fa3d
Merge pull request #632 from owncloud/fix_629
...
fix pattern for database names - #629
2013-01-06 14:03:02 -08:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
5ea8adc7c7
Reformat long line
2013-01-05 12:21:57 -05:00
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
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
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
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
913c96ddc5
Merge pull request #1081 from owncloud/fix-issue-1075
...
Remove echo from lost password page
2013-01-04 10:17:25 -08:00
394cebc90f
Remove echo from lost password page
2013-01-04 11:12:28 -05:00
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
e2f549f6d7
remove css not selector - incompatible with ie8
2013-01-02 18:01:33 +01:00
fe4f056a23
use jQuery.parseJSON fallback for IE6/7/8
2013-01-02 17:13:23 +01:00
4a7604daa2
remove , at end of js. IE8 chokes on this
2013-01-02 17:02:06 +01:00
5b07e722cb
combine ie8 fix with debug check
2013-01-02 12:21:30 +01:00
e998da06d1
fix broken console.log in ie8
2013-01-02 12:13:07 +01:00
c6064a542c
[tx-robot] updated from transifex
2013-01-01 00:04:42 +01:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
9aefbea074
[tx-robot] updated from transifex
2012-12-29 00:08:28 +01:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
b7257b2524
[tx-robot] updated from transifex
2012-12-26 00:12:10 +01:00
5d59ac0739
[tx-robot] updated from transifex
2012-12-25 00:11:11 +01:00
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
05fda76776
[tx-robot] updated from transifex
2012-12-22 00:26:25 +01:00
c317da7814
multiSelect: Add sorting options.
2012-12-21 06:18:10 +01:00
689edc2534
multiSelect: Make sure up/down classes are removed on close.
2012-12-21 06:17:13 +01:00
63fa943a52
multiSelect: Don't force popup above if there's no room for it there.
2012-12-21 00:53:23 +01:00
73b186cc60
Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_multiSelect
2012-12-21 00:52:29 +01:00
3e39c39d6a
[tx-robot] updated from transifex
2012-12-21 00:11:31 +01:00
84ba66e9b7
Merge pull request #978 from owncloud/logout-icon
...
fix logout icon, hopefully also #969
2012-12-20 14:51:36 -08:00
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
1cbd04a2c4
fix logout icon, hopefully also #969
2012-12-20 13:49:43 +01:00
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
ecf82d2218
[tx-robot] updated from transifex
2012-12-20 00:13:09 +01:00
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
ad497d23ec
Merge pull request #949 from RandolfCarter/InvalidDefaultAddress
...
Fixing default email sender address
2012-12-19 00:33:53 -08:00
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
74b4fefda8
remove padding from header
2012-12-19 00:10:03 +01:00
982e46cd29
[tx-robot] updated from transifex
2012-12-19 00:04:14 +01:00
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
3adfb91ad8
call the password input field by name
2012-12-18 13:40:19 +01:00
d873f0da35
autofocus to password input after clicking the checkbox; code restructured; debug output added
2012-12-18 13:39:52 +01:00
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
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
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
bbe805b665
use regex which was suggested by dragotin
2012-12-17 12:28:34 +01:00
0c87f666ad
[tx-robot] updated from transifex
2012-12-16 00:12:10 +01:00
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
9f5868cf18
[tx-robot] updated from transifex
2012-12-15 00:12:10 +01:00
5689c78ee6
rename to doc
2012-12-14 14:39:05 +01:00
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
a871e300e2
Merge pull request #850 from owncloud/icons-for-login
...
Icons for login
2012-12-14 00:12:41 -08:00
6d7ae463df
[tx-robot] updated from transifex
2012-12-14 00:17:42 +01:00
0bc2dc24cd
remove transitions for file rows and actions because it made everything seem sluggish
2012-12-13 19:12:09 +01:00
2c41ae4372
small code reordering of inputs and buttons
2012-12-13 12:51:45 +01:00
7881bf1d4d
improve general button coloring
2012-12-13 12:49:59 +01:00
f85106b6b5
first version of the new documentation system integration.
2012-12-12 22:41:12 +01:00
9d8bdff51b
tweak icons for username and password fields, now it’s good
2012-12-12 22:40:08 +01:00
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
c938a4f791
feedback to the user while request is being processed
2012-12-12 12:34:28 +01:00
bac4e011dc
[tx-robot] updated from transifex
2012-12-12 00:14:08 +01:00
90e8e94909
icons for username and password field, not sure if it’s good
2012-12-11 18:54:43 +01:00
b72a0f5680
remove obsolete CSS, fix database host label position
2012-12-11 13:02:45 +01:00
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
45074d5023
restoring feature to send sharing link via email
2012-12-10 18:41:08 +01:00
cb6c430321
add my install changes from #721 again after they have been reverted through #282
2012-12-10 15:08:58 +01:00
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
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
e3e4dcf77b
[tx-robot] updated from transifex
2012-12-09 00:12:41 +01:00
2ca72d0da7
[tx-robot] updated from transifex
2012-12-08 00:10:53 +01:00
787e8b86d9
cleanup CSS whitespace and remove extra input[type='checkbok']
2012-12-07 17:41:52 +01:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
75367f91e0
Merge pull request #721 from owncloud/improve-installation-and-login
...
Improve installation and login
2012-12-07 05:30:30 -08:00
1e062ea895
Merge pull request #182 from owncloud/fix-redirect
...
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
e989493eca
properly center data directory label
2012-12-06 16:44:48 +01:00
4f513f279a
fix dbhostlabel not disappearing, remove obsolete CSS
2012-12-06 16:41:06 +01:00
0fa59f8937
use vector logo also on log in page, d'oh (also now retina-ready)
2012-12-06 16:29:56 +01:00
2288b26305
fix missing feedback when tab-focusing on checkbox
2012-12-06 16:28:02 +01:00
69a9fe75a0
[tx-robot] updated from transifex
2012-12-06 00:12:08 +01:00
c487d9fc7e
Merge pull request #716 from eMerzh/remove_sqlite2
...
Remove support of sqlite2
2012-12-05 03:18:02 -08:00
b6fca70ee4
add primary action button in fitting subtle dark blue
2012-12-05 00:37:00 +01:00
56dae06528
move inline warning styles into CSS, clean up and fix #270
2012-12-05 00:25:58 +01:00
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
13e0287b74
better layout for installation page elements, centered and subdued legend text
2012-12-04 23:55:31 +01:00
5ccea4cc2f
small fixes: toggle color adjustment, remove colon, prevent label wrapping
2012-12-04 23:09:30 +01:00
6d643f9e74
multiSelect.js: Give each select a unique msid to prevent double adding in users.js
2012-12-04 21:21:54 +01:00
4df61c3e45
Simplify has sqlite test
2012-12-04 19:34:24 +00:00
e6ec0e8a5e
Remove support of sqlite2 at installation
2012-12-04 17:36:23 +00:00
8837f2a307
multiSelect: Added scrollbar if longer than 20em. Ref #720
2012-12-04 18:00:14 +01:00
feeaaf2d29
multiSelect: Make sure last added entry is selected and some code cleanup.
2012-12-04 18:00:14 +01:00
daf452b4ba
Added some missing type checks.
2012-12-04 18:00:13 +01:00
9ddd754bce
Enhanced multiSelect jquery plugin.
2012-12-04 18:00:13 +01:00
855a011697
group related input fields visually
2012-12-04 16:58:42 +01:00
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
3e519945c3
replace minified infieldlabel with dcneiners version
2012-12-04 13:30:13 +01:00
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
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
a0fe53d09a
fix pattern for database names
2012-11-29 15:08:05 +01:00
6c3f43b061
[tx-robot] updated from transifex
2012-11-29 00:04:57 +01:00
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
5c9faf396a
Sharing: Fix false positived v. 2
2012-11-27 23:01:26 +01:00
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
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
4c707d1b1f
remove debug output
2012-11-26 14:35:02 +01:00
e5ad774ab0
coding style
2012-11-26 14:34:51 +01:00
4764876192
check whether to join url with ? or &
2012-11-26 14:34:41 +01:00
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
dde3342398
[tx-robot] updated from transifex
2012-11-24 00:03:00 +01:00
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
19797ee7db
even error messages have the right to look a bit pretty
2012-11-23 14:22:57 +01:00
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
c5e891008b
[tx-robot] updated from transifex
2012-11-19 00:01:48 +01:00
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
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
9e9bf20b07
Merge pull request #495 from owncloud/fix_issue_262
...
Fix lostpassword url generation
2012-11-17 02:09:40 -08:00
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
03b8ba273a
Fix lostpassword url generation
...
Fixes issue #262
2012-11-16 22:01:24 +01:00
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
b99213f7a7
Merge pull request #458 from owncloud/js_console_switch
...
Very simple js console switcher.
2012-11-15 15:05:47 -08:00
d86a368e54
[tx-robot] updated from transifex
2012-11-16 00:03:47 +01:00
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
defdbe3c10
removed unneeded callback checks in routes_request that could potentially fail
2012-11-15 15:07:01 +01:00
25e4a071ef
fixed: this.routes_request is a deferred/promise
2012-11-15 15:01:21 +01:00
bf20021b62
instead of warning via popup, write to console.warn
2012-11-15 14:48:18 +01:00
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
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
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
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
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
49f05dfade
Merge pull request #402 from zimba12/master
...
Uncomment hours entries in relative date functions
2012-11-14 05:36:04 -08:00
e06513d76b
Fixing syntax error - closes #406
2012-11-14 11:17:21 +01:00
99af3433d1
Fixing syntax error - closes #406
2012-11-14 11:10:31 +01:00
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
c353568ea0
Merge pull request #41 from owncloud/vcategories_db
...
OC_VCategories - this time actually usable ;)
2012-11-13 15:40:46 -08:00
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
34a7e81ffb
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-13 12:10:49 +01:00
ad85087fcc
Use util function to protect datadirectory in setup
2012-11-13 08:54:19 +01:00
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
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
fd709fc021
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-11 20:20:09 +01:00
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
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
73d59bd397
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-06 00:10:45 +01:00
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
1aec5378b8
make images in buttons also show click-hand on hover
2012-11-05 19:54:48 +01:00
be77d81152
VCategories: Closing brace must be on a line by itself.
2012-11-05 16:38:23 +01:00
8c492a86fc
VCategories: Line too long.
2012-11-05 16:35:25 +01:00
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
b05666219e
Merge branch 'master' into navigation
2012-11-02 13:36:01 +01:00
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +01:00
290d0714df
Add routes for vcategory favorites.
2012-11-01 03:05:48 +01:00
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
f50c043cfb
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-31 18:52:13 +01:00
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
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
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
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
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
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
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
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
c4b8bb1041
added old functions again to not break apps, but show a deprecation warning
2012-10-29 01:14:07 +01:00
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04:00
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
db5e8f3eea
enable hover state, now that needs to be added to the other icons
2012-10-28 17:22:18 +01:00
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
99ba05e766
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-28 16:48:30 +01:00
71435ac1cc
improve user menu
2012-10-28 16:47:25 +01:00
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
2012-10-28 10:21:06 +01:00
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
fefc4e1707
Load all apps in core share ajax file for apps to register their share backends
2012-10-27 17:25:10 -04:00
a6f3a570c6
dont resize content div with javascript but use css box-sizing to do it
2012-10-27 19:42:25 +02:00
fc280b2887
first move of settings to top right
2012-10-27 18:58:16 +02:00
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
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
628c7ca9cf
closes #113
2012-10-26 21:18:03 +02:00
0cf1fef3fa
Fix for problems using for() function instead of $.each for arrays with IE8
2012-10-26 20:34:04 +02:00
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
ec613b589b
Fix not defined JS variables
2012-10-25 17:51:59 +02:00
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
9185cd5dae
Remove uneeded vendor prefixes
2012-10-24 00:01:18 +02:00
9c17aa41ed
Format CSS in a readable way
2012-10-24 00:00:58 +02:00
4956380a89
Remove uneeded vendor prefixes
2012-10-23 23:56:15 +02:00
dcb286855e
Format the CSS in a readable way...
2012-10-23 23:55:59 +02:00
787994139b
Remove uneeded vendor prefixes
2012-10-23 23:55:17 +02:00
badda69b89
Format the CSS in a readable way...
2012-10-23 23:54:39 +02:00
b1150f6a7f
Urlencode the share URL
...
Fixes #63
2012-10-23 17:55:49 +02:00
b66dd3ebef
Merge pull request #38 from scambra/datepicker-l10n
...
Translate Datepicker
2012-10-22 23:53:24 -07:00
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
befdd6b63b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-23 06:23:03 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
69cf89c5f6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-22 15:41:39 +02:00
273fdb7b64
Added type and callback arguments to most methods.
2012-10-22 15:40:08 +02:00
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
699a484f42
Fix font family for textarea
2012-10-20 14:15:33 -04:00
dd58849aa0
Apply textbox CSS rules to textarea as well
2012-10-20 14:11:35 -04:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
03ff614265
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 02:27:04 +02:00
fdf3ec1027
Add wait state to category dialog while processing.
2012-10-19 02:25:39 +02:00
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
81536a81e3
More js updates for app/type in OCCategories
2012-10-19 00:39:09 +02:00
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +02:00
3b6cfe4977
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 00:17:28 +02:00
97c884c548
Updated category js for handling favorites and use post instead of get.
2012-10-19 00:09:07 +02:00
26719005a4
Added ajax files for favorite category handling.
2012-10-19 00:07:41 +02:00
f4fd4a5a52
Updated category ajax files to use type instead of app and add callCheck.
2012-10-19 00:06:18 +02:00
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
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
a8d0f84829
Resetting the password should also invalidate the token login cookies
2012-10-17 17:26:12 +02:00
0a614429af
Change the lostpassword flow to a controller
2012-10-17 17:24:49 +02:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
ec253f1354
Use strftime to format date with translated month names
2012-10-16 20:19:35 +02:00
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
3eb43c1fbe
Show a warning in the installer if .htaccess is not working
2012-10-15 23:25:15 +02:00
d7a4547482
avoid undefined index warning on login page
2012-10-15 20:37:52 +02:00
842d6dad47
Remove space
2012-10-15 17:42:38 +02:00
d33bec09fe
Verify password page for users
2012-10-15 17:42:38 +02:00
c930ac9f88
Merge pull request #30 from visit1985/logonpage
...
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00
7095b3a083
extend logon page to display multiple error messages
2012-10-14 19:57:24 +02:00
2c427f050e
Show a warning in the installer if no secure RNG is available
2012-10-14 17:18:30 +02:00
99cd922b82
Doublehash the token to prevent timing attacks
2012-10-14 12:13:02 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
cdd30216b1
escapeHTML function
2012-10-12 14:10:11 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
a0c53619ff
Merge pull request #24 from owncloud/js_variable_interpolation
...
A suggestion for simple, yet efficient variable interpolation in js translations
2012-10-10 00:40:47 -07:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
b475164e95
Fix autocomplete search for users for groups only share policy
2012-10-09 08:35:07 -04:00
003241e847
fix for bug #1942 : Allow user to share with every group if "allow users to share with anyone" is set
2012-10-09 10:36:24 +02:00
71ff6382b5
Prevent closing sharing dialog on picking the date
2012-10-08 22:38:14 +03:00
06d00af9f8
Prevent closing sharing dialog on month adjustment. Fixes oc-1884
2012-10-08 22:03:16 +03:00
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
b934668b9e
[tx-robot] updated from transifex
2012-10-08 02:07:01 +02:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
f493e97f5d
always generate access token, also for forms shown to anonymous users (e.g. public shares)
2012-10-05 10:32:38 +02:00
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
bb345770af
Suggestion for simple, yet efficient variable interpolation in js translations.
2012-10-05 03:33:46 +02:00
16eade5a3b
share.expiration is null if no expiration date is set.
2012-10-04 11:18:37 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
7bee735877
Show correct public link url for folders
2012-10-03 16:17:36 -04:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
36696a8057
Fixed old, annoying css error that it turned out I had made myself :-P
2012-10-01 23:42:45 +02:00
43c85248d4
Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871
2012-10-01 16:04:20 +02:00
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
f8eebcbb01
reload the current url when login in instead of always redirecting to the default app (oc-1873)
2012-09-30 03:47:37 +02:00
7e30c74ea4
[tx-robot] updated from transifex
2012-09-30 02:05:59 +02:00
a33dda3c65
Fix double url decoding in fileDownloadPath function
2012-09-29 18:10:23 +02:00
ef57e9294b
Fallback for systems without openssl
2012-09-29 16:44:02 +02:00
36f1c9b083
rand() + uniqid() are not from cryptographic quality
2012-09-29 15:33:10 +02:00
578aa4e425
Removed sectoken
...
This token is completly useless since an attacker can easily extract it
from the page.
2012-09-29 15:18:38 +02:00
f5fe95a131
Removed sectoken
...
This token is completly useless since an attacker can easily extract it
from the page.
2012-09-29 15:15:35 +02:00
dc66e94ee3
[tx-robot] updated from transifex
2012-09-29 02:04:55 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
7f6a984e57
Merge pull request #20 from scambra/undo-l10n
...
undo interpolation in js for 4.5
2012-09-28 14:32:44 -07:00
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
8f27881770
undo interpolation in js for 4.5
2012-09-28 19:53:18 +02:00
71454b1bca
Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations)
2012-09-28 18:57:20 +02:00
bf1057143c
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
2012-09-28 15:38:49 +02:00
4dbd4c35c5
Merge branch 'master' of git://github.com/owncloud/core
2012-09-28 13:31:01 +02:00
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
00103d730f
Show share expiration date set for shared item
2012-09-26 00:04:27 -04:00
2bdf89f4d4
Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773
2012-09-25 23:18:36 -04:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
ac79fe649c
Added a missing CSRF check
2012-09-22 11:02:03 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
d5211f9615
some characters in comments avoid finding some strings to translate
2012-09-21 12:05:01 +02:00
0f15bc881f
fix translating dialog buttons, they are translated in core not dialogs app
2012-09-21 11:48:57 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
b1c60841e8
float right element needs to be the first element, otherwise firefox will move it to a new line
2012-09-20 10:31:23 +02:00
edbbb2bd9f
General style fixes for the share dropdown
2012-09-19 20:04:16 +00:00
fb3724ba64
Fix datepicker icons for all uses across ownCloud
2012-09-19 16:51:20 +00:00
518ca0ac58
Fix changing of share status icons, bug fix for oc-1631
2012-09-19 01:44:15 -04:00
1e1e8ae3b5
Don't show the expiration option until a share occurs, bug fix for oc-1724
2012-09-19 01:02:57 -04:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
df528cfe95
show the current username. This confused some people
2012-09-12 12:23:21 +02:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
54d4e556fe
Add lock and clock icon for sharing
2012-09-12 01:02:08 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
0b2633a787
add breadcrumb controll to js
2012-09-09 03:00:01 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
9beb958845
forgot a ,
2012-09-09 00:35:02 +02:00
b14265b5c3
add js versions of basename and dirname
2012-09-08 23:59:02 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
90462b2dcf
make icons look good on bright and dark backgrounds
2012-09-06 13:47:07 +02:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
daf41885e5
jquery added to ignorelist for l10n
2012-09-05 22:53:48 +02:00
e0db35fac0
Fix name for OCCategories
2012-09-05 22:26:09 +02:00
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
5868f834c8
Respect coding style
2012-09-04 13:21:36 +03:00
ae67841461
Respect coding style
2012-09-04 13:21:00 +03:00
ff8b8909c1
Respect coding style
2012-09-04 13:19:44 +03:00
f4cace6cc1
Respect coding style
2012-09-04 13:19:04 +03:00
6e76c59007
Remove closing php tag
2012-09-04 13:18:11 +03:00
5bd4d6b051
Respect coding style
2012-09-04 13:17:14 +03:00
9e5807d1f9
fixing syntax error - sorry for that
2012-09-04 13:13:18 +03:00
6d358c051f
Update core/lostpassword/templates/email.php
...
respect coding style
2012-09-04 13:10:14 +03:00
97e4647ad5
Update core/lostpassword/resetpassword.php
2012-09-04 13:09:25 +03:00
395ea2a028
Update core/lostpassword/index.php
...
respect coding style
2012-09-04 13:08:55 +03:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
5a9a795cd5
Fix check in Javascript for password protected link
2012-09-01 13:52:12 -04:00
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
c07eb4fec6
Make css selector more specific for the sharing dropdown
2012-08-31 17:26:32 -04:00
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
61a3e5f96b
unify permissions (1/3): add permission conastants to javascript OC
2012-08-31 01:11:10 +02:00
6324daecc0
Don't wait for document ready for setting requesttoken
2012-08-30 23:10:24 +02:00
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
8990855f88
add OC.get and OC.set to get/set variables by name in javascript
2012-08-30 03:02:29 +02:00
3828d86191
Remove old Javascript code
2012-08-29 14:37:36 -04:00
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
76bc4753e9
Fix displaying if a link is password protected
2012-08-29 14:06:55 -04:00
0788c6e968
Hide link password controls if link is removed
2012-08-29 14:06:55 -04:00
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
9fcb916057
Fix toggling of password protection in sharing dropdown
2012-08-29 11:54:49 -04:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
92c782c1b0
return the jQuery deferred object when using OC.loadScript
2012-08-29 01:57:59 +02:00
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
4910717c09
remove background fade from navigation, fix flickering icon issue and make it feel faster
2012-08-27 14:05:18 -07:00
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
545812f589
Move additional jquery.inview files
2012-08-26 18:50:20 -04:00
d6bb04a74e
Move jquery.inview from contacts app to core
2012-08-26 17:55:51 -04:00
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
a1a3862274
[tx-robot] updated from transifex
2012-08-26 02:02:48 +02:00
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
d84b1adf34
Dynamically update shared status icon
2012-08-24 15:32:06 -04:00
7168fa4b05
Add padding to the reshared text
2012-08-24 15:12:16 -04:00
fedb3641f9
Determine if reshare needs to be checked
2012-08-24 15:12:16 -04:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
76e0ca785b
Added XSRF check
2012-08-24 14:58:48 +02:00
a3b4cb205c
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-24 14:54:16 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
aefa52018d
Use right variable name.
2012-08-23 05:02:30 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
49229da0e1
Remove setTarget from ajax
2012-08-20 21:22:22 -04:00
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
5eca531f99
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
2012-08-19 22:14:38 -04:00
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
b6a3bf154d
Comment out javascript that hides login button
...
It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.
2012-08-16 20:55:10 +00:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
63af75586b
Merge branch 'master' into routing
2012-08-15 17:39:00 +02:00
4954e46bb2
Use core routes in js too
2012-08-15 17:38:55 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
64ef1e2181
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
2012-08-12 14:49:41 -04:00
eb516b79b6
Position appsettings fixed and load it in dynamically added element.
2012-08-12 18:42:54 +02:00
db4111f6d5
Routing: Add some core routes
2012-08-12 16:52:36 +02:00
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
81b997b56e
Merge branch 'backgroundjobs'
2012-08-10 13:00:51 +02:00
667cd318fe
Use OC_Util::displayLoginPage and cleanup the function
2012-08-10 11:43:04 +02:00
334296b027
Removed unused file
2012-08-10 00:09:00 +02:00
ab97c04894
Added XSRF check
2012-08-10 00:09:00 +02:00
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
7fa896971f
JavaScript file for activating web cron
2012-08-09 00:58:54 +02:00
d02b0e39b2
Fix issues with hiding and showing dropdown
2012-08-08 17:50:09 -04:00
a22f30fb78
Reset item shares variable, fixes autocomplete not showing people
2012-08-08 11:39:00 -04:00
b1a7e30819
Actually change background image of shared items
2012-08-07 21:23:55 -04:00
d4882df8cb
Fix warnings and better styling
2012-08-07 23:29:56 +02:00
1b5c8ff471
Don't return error when just no sharing found
2012-08-07 23:29:01 +02:00
0ddfc94cf5
Try to fix last commit
2012-08-07 14:34:29 -04:00
5e2ef1e918
Check if itemShares share type is an array instead of set, javascript likes to set indexes to 'undefined'
2012-08-07 14:11:48 -04:00
b6b713eb76
Only show the user's groups in the share with autocomplete
2012-08-06 20:43:08 -04:00
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
51ddc44b62
Somewhat fixes dropdown display issues in the contacts app
2012-08-06 15:43:20 -04:00
6f83540dd6
Remove person from array after unshare, so name appears in autocomplete again
2012-08-06 14:45:45 -04:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
4f10574065
Don't load item if it doesn't have it status set
2012-08-06 13:30:44 -04:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
cc445e4e47
Small changes to allow updating main menu dynamically.
2012-08-05 01:42:17 +02:00
538e72fe61
Fix scrollbar issue. Fixes oc-1414
2012-08-04 23:30:28 +00:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
c5d5ca88a8
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-03 13:15:15 +02:00
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
26e406c3c0
Hide 'can edit' if not checked
2012-08-01 18:03:00 -04:00
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
2201074e1f
Basic setup for sharing with contacts
2012-08-01 17:17:28 -04:00
98f37b93f6
Propagate exceptions in OC.appSettings.
2012-08-01 16:24:02 +02:00
83b935a1c2
Prevent up and down arrow from changing the share with input value
2012-07-31 21:31:59 -04:00
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04:00
274d1ef87f
[tx-robot] updated from transifex
2012-08-01 02:02:35 +02:00
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
269922543e
Give share with search focus when sharing dropdown appears
2012-07-31 14:48:19 -04:00
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
8d01e1a355
Don't show self or already shared with users and groups in the share with search
2012-07-31 13:06:32 -04:00
8729119d4b
Add suggestion to share with search for sharing via email
2012-07-31 10:18:26 -04:00
6df95db8e8
Forgot to also use the options I added :-P
2012-07-31 16:05:58 +02:00
8837576ce7
Added some more options to OC.appSettings().
2012-07-31 16:03:08 +02:00
fb14cb87bd
Made the parameter for OC.appSettings() an object to be able to extend it.
2012-07-31 14:17:28 +02:00
084866cb1e
White space
2012-07-31 14:06:44 +02:00
553773f2e1
Popup for app specific settings.
2012-07-31 12:23:22 +02:00
d66f071d3e
Use search and limit parameters for share with search in sharing dropdown
2012-07-30 20:21:48 -04:00
ed71343df8
Autocomplete for share with search in sharing dropdown
2012-07-30 15:30:21 -04:00
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
db72ce398b
Add support for configuring which permissions are possible for items
2012-07-27 10:13:23 -04:00
680eed6bac
fix for bug #1295 , don't escape password reset link
2012-07-27 15:35:36 +02:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
12dfe5868a
Updated style
2012-07-26 01:38:46 +02:00
d24326ecce
Updated style
2012-07-26 01:38:20 +02:00
d425740dc2
Remove unused files
2012-07-26 01:19:46 +02:00
1554d7a2c0
Check for admin user
2012-07-26 01:16:32 +02:00
9605e1926c
Check for admin user
2012-07-26 00:06:51 +02:00
85a410d7a3
Remove unused files
2012-07-26 00:04:12 +02:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
20a174e71b
remove second "autocomplete" statement
2012-07-18 12:27:15 +02:00
3895e3a5ae
remember username and provide autocomplete feature
2012-07-18 12:26:10 +02:00
0ea29398c7
remember username and provide autocomplete feature
2012-07-18 12:22:30 +02:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
88f4845ca3
Sanitization isn't required here
2012-07-11 20:04:18 -04:00
cbf851de69
Show private link in dropdown
2012-07-11 12:21:30 -04:00
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
b148256233
Get rid of sneaky error_log() that got left behind
2012-07-10 21:30:52 -04:00
c0e1b8e7e7
Sanitize POST and GET in ajax/share
2012-07-10 19:54:03 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
0045e64041
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:49:15 -04:00
90e4af312a
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:38:54 -04:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
799e34acd4
Add slash to app url if not set fix oc-1169
2012-07-03 21:58:36 +00:00
1ad5e3e39f
Add parameter to showDropDown to not show private link UI, only files can be shared as private links
2012-07-03 17:00:23 -04:00
db33765e36
Add share with to list in dropdown after sharing
2012-07-03 16:52:53 -04:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
dd56416a39
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
2012-07-02 14:23:13 -04:00
dd7d34a40e
Prevent adding a duplicate to a multiselect
2012-07-01 11:36:44 -04:00
949cab7ea1
Add new group to other user's group select forms
2012-07-01 11:36:31 -04:00
f456cee9d8
Fix fetching item type from share class element, comment out the auto hider for now since it doesn't work outside of the Files app
2012-06-30 21:06:04 -04:00
433d15d309
Merge branch 'master' into calendar_import
2012-06-30 12:50:26 +02:00
8e4832bd12
Prevent adding a duplicate to a multiselect
2012-06-29 16:44:08 -04:00
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
cb19fdd55b
Show users and groups shared with in dropdown
2012-06-27 01:05:37 +02:00
578b8a9da1
$_POST variables should be $_GET for fetch
2012-06-27 01:05:36 +02:00
b5961635ea
Fix ajax share file and replace 'User or Group' select form with a textbox
2012-06-27 01:05:36 +02:00
f21fdf14f9
Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
4e53db3d9c
Merge branch 'master' into oc_error
2012-06-26 14:17:32 +02:00
595ff468f5
typo in js statement fixed
2012-06-26 10:36:33 +02:00
18d5420744
typo in js statement fixed
2012-06-26 10:35:19 +02:00
f374dae233
Added text ACS warning to admin's user settings page, and corresponding CSS styles
2012-06-25 18:04:10 +01:00
a113ee9e9f
add x-webkit-speech to searchbox
2012-06-24 00:42:16 +02:00
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +02:00
df60d6d5d2
Fixes for multi app dir :
...
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
c3cd3f3571
CSS class headerAction -> header-action
2012-06-18 23:22:52 +02:00
0132b80282
added CSS class .headerAction
2012-06-18 23:18:32 +02:00
6bd0a158f7
Merge branch 'master' into oc_error
2012-06-18 15:59:39 +02:00
2f00384b51
Use TemplateLayout functions for finding js and css files in minimizer
2012-06-18 15:40:48 +02:00
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +02:00
4a50c15a8e
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
2012-06-18 13:36:49 +02:00
617de811f7
Cache the minimized output also on the server
2012-06-18 11:11:46 +02:00
06c610c2ee
Merge branch 'master' into oc_error
2012-06-17 08:36:33 +02:00
99a68abbd5
Add session_write_close to the minimizer
2012-06-16 20:52:10 +02:00
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
f0b87bc421
Make requesttoken global.
2012-06-14 18:13:01 +02:00
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
89464721c7
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
2012-06-13 17:33:19 +02:00
48ee265170
urlencode link fort password reset (bug #970 )
2012-06-13 17:26:30 +02:00
b9d5f510c3
urlencode link fort password reset (bug #970 )
2012-06-13 17:22:28 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
82abbed883
Merge branch 'master' into oc_error
2012-06-10 18:38:38 +02:00
8f616ecf76
fix potential xss in multiselect
2012-06-09 15:08:05 +02:00
cfe219fbb9
fix potential xss in multiselect
2012-06-09 15:07:16 +02:00
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +02:00
4260dce826
Better handling of core.css and core.js
...
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
2012-06-07 21:35:40 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d28e0f4d5b
Remove old internal mail call for password reset, fixes bug oc-934
...
Conflicts:
core/lostpassword/index.php
2012-06-07 09:36:23 -04:00
3c3a2b9b27
Remove old internal mail call for password reset, fixes bug oc-934
2012-06-07 09:25:50 -04:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
eed0450351
Fix remap dir for CSS minimizer
2012-06-05 18:09:32 +02:00
7e017253f5
Load apps before minimizing the core css and js
2012-06-04 23:17:50 +02:00
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
ede89ee405
oc-657: icons for M$ office file types
2012-05-21 09:35:31 +02:00
Bart Visscher
Jenkins for ownCloud
kondou
Bernhard Posselt
Thomas Tanghus
Jan-Christoph Borchardt
Raghu Nayyar
Morris Jobke
Arthur Schiwon
yannickoo
Lukas Reschke
Doug Neiner
Henning Oschwald
Frank Karlitschek
Björn Schießle
Ceri Davies
Michael Gapczynski
Florian Hülsmann
Georg Ehrke
Jörn Friedrich Dreyer
Georg Ehrke
Brice Maron
Robin Appelman
Qingping Hou
Björn Schießle
Administrator
Tobias Ramforth
Georg Ehrke
Randolph Carter
libasys
Alessandro Cosentino
Felix Moeller
scambra
Michael Göhler
Victor Dubiniuk
Christian Reiner
Christian Reiner
Tom Needham
Anders Nor Berle
Jakob Sack
Michael Gapczynski
Sam Tuke