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
Michael Gapczynski
Lukas Reschke
Thomas Müller
Björn Schießle
raghunayyar
Georg Ehrke
Thomas Tanghus
Robin Appelman
Jan-Christoph Borchardt
Bernhard Posselt
Bart Visscher
Jörn Friedrich Dreyer
Frank Karlitschek
Randolph Carter
Brice Maron
Arthur Schiwon
libasys
Alessandro Cosentino