Thomas Tanghus
a0b79f5649
Dialogs: Loose up-button.
2013-05-17 06:48:24 +02:00
Thomas Tanghus
e60d86bdd1
Dialogs: Make slug show last dir emphasized.
2013-05-17 06:16:51 +02:00
Thomas Tanghus
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
Thomas Tanghus
913941d894
Line length etc.
2013-05-16 18:19:28 +02:00
Thomas Tanghus
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Jörn Friedrich Dreyer
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
Lukas Reschke
337e3ed61f
Typo
2013-05-12 10:51:21 +02:00
Lukas Reschke
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
Thomas Tanghus
048569754a
Add compatibility function for outerHTML
2013-04-29 22:35:37 +02:00
Bart Visscher
26e2672a5a
Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
...
turn off autocompletion for password field
2013-04-26 01:59:20 -07:00
kondou
e8bb998ecc
Fix #3095 .
2013-04-24 11:13:12 +02:00
Morris Jobke
938b12236a
modify password clone to password type right on submit to prevent the browser remind the content
2013-04-19 10:06:18 +02:00
Thomas Tanghus
3f7643ef46
Merge pull request #2769 from owncloud/octemplate
...
Add octemplate jQuery plugin
2013-04-15 13:42:35 -07:00
Thomas Tanghus
155582ab70
Updated docs.
2013-04-15 22:10:29 +02:00
raghunayyar
59be6a910c
Implements Toggle for Database Password.
2013-04-13 09:45:30 +05:30
Bernhard Posselt
18c873d1e5
Merge pull request #2554 from owncloud/hide-toggle-checkbox
...
Implements Hide / Display for the Password Toggle Button
2013-04-11 01:18:40 -07:00
Bart Visscher
51e07a90b7
Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
...
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
kondou
5f89812a9b
Fix #2730
...
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
kondou
e44cc8ea57
Fix OC.dialogs.form()
...
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
kondou
9c53f35d9a
Remove manual mimetype checking.
2013-04-08 23:00:02 +02:00
Morris Jobke
38941a61bf
turn off autocompletion for password field
...
refs #2632
2013-04-07 21:51:10 +02:00
Thomas Tanghus
870b73ce5a
Add octemplate jQuery plugin
2013-04-06 23:24:43 +02:00
Thomas Tanghus
75af38c1bd
Move compatibility functions to compatibility.js and add two more.
2013-04-06 22:37:15 +02:00
kondou
275badaf76
Make files _and_ directorys selectable/browsable.
...
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02:00
kondou
d556e7fbc0
Make files selectable again.
2013-04-06 17:22:55 +02:00
kondou
3e185911f1
Fix repeating directory names.
...
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
kondou
fba6681f71
Make directories show at top.
2013-04-06 14:42:56 +02:00
kondou
6231e5be39
Make directories clickable.
...
A bit bugged though ...
2013-04-06 14:17:47 +02:00
kondou
1919acd68f
Small fixes
...
* escapeHTML(everything)
* curly braces for if
* camelcase function_to_call
* add missing semicolae (?)
2013-04-06 12:16:55 +02:00
kondou
0be80abe70
Refactor OCdialogs.
...
Fix #2557 and make the whole code more usable.
2013-04-06 10:07:12 +02:00
root
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Bernhard Posselt
86ac30c596
Merge pull request #2516 from kabum/master
...
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
Arthur Schiwon
c51396551d
Whitespaces
2013-03-27 22:55:17 +01:00
Arthur Schiwon
3af61a0a7c
Share Dialog: show Displayname instead of internal name
2013-03-27 22:55:05 +01:00
raghunayyar
8d7aa42b9a
Removes the setTimeout() method.
2013-03-26 23:32:26 +05:30
raghunayyar
25a8690318
Fixes autofill for display / hide toggle button, a better function name.
2013-03-25 16:09:35 +05:30
raghunayyar
d9cd9875e0
Initial Commit : Password Toggle Button hides if no input present
2013-03-25 04:30:09 +05:30
Morris Jobke
79d99b9c96
use simple markup to highlight groups in share autocomplete
2013-03-22 10:00:43 +01:00
Morris Jobke
8871629db5
replace hardcoded css style with css class - ref owncloud/core#173
2013-03-21 23:19:59 +01:00
Morris Jobke
a1a6ef9409
share autocomplete - improve group appearance
...
highlight groups with markup (bold font) instead of "(group)" postfix
ref owncloud/core#173
2013-03-21 22:45:36 +01:00
Doug Neiner
b8c1a4da3e
Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms
2013-03-17 22:21:34 -05:00
Bernhard Posselt
9ad03b61a3
Update share.js
...
Added HTML escaping
2013-03-08 17:29:05 +01:00
Michael Gapczynski
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
Georg Ehrke
a83a5aa900
fix #2128
2013-03-06 13:02:44 +01:00
Thomas Tanghus
e9f46a7452
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 16:36:49 +01:00
Lukas Reschke
577945bd33
Sanitize shareWith
2013-03-04 00:54:21 +01:00
Michael Gapczynski
0488968443
Merge pull request #2034 from owncloud/fix_bug47
...
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Georg Ehrke
620ddd3baa
new Array() -> []
2013-03-02 19:24:37 +01:00
Georg Ehrke
22424e8abc
update OC.Notification.show
2013-03-02 17:36:04 +01:00
Georg Ehrke
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
Bart Visscher
294403fa99
The router base url is without / on the end
2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt
e01ab04d2b
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 17:57:53 +01:00
Thomas Müller
58b06c5c9a
Merge pull request #1905 from owncloud/fix-share-icons
...
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt
f36d92bbc1
Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
...
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
Bernhard Posselt
a65b16f3e7
generate url only once
2013-02-26 20:45:25 +01:00
Bernhard Posselt
81bb4363a2
use 15 min instead of 15 sec timeout
2013-02-26 20:25:07 +01:00
Bernhard Posselt
4e55348054
implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout
2013-02-26 19:34:46 +01:00
Michael Gapczynski
5b732ac1ea
Move space
2013-02-25 20:52:01 -05:00
Michael Gapczynski
aa2ea9e3de
Fix adding share icons to share action
2013-02-25 20:20:29 -05:00
Thomas Müller
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Thomas Müller
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
Thomas Mueller
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
Bart Visscher
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
Jörn Friedrich Dreyer
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
raghunayyar
6ecc3d7ee1
Reduced email input width by 10% to increase space.
2013-02-20 23:08:21 +05:30
raghunayyar
d8e8dab006
Fixes the Email Button and the email input Width.
2013-02-20 21:37:23 +05:30
Thomas Tanghus
5a8e0f2048
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-16 19:56:56 +01:00
Thomas Mueller
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
Bernhard Posselt
db30f94fc8
Merge pull request #1697 from owncloud/navigation-details
...
Navigation details
2013-02-14 08:39:17 -08:00
Jan-Christoph Borchardt
3f09cc139f
double speed for user menu slide
2013-02-14 17:13:50 +01:00
Thomas Mueller
e643742eb3
adding prototype trim as fallback for IE8
2013-02-14 12:59:26 +01:00
Thomas Mueller
8065c73339
fixing eventsource.js for IE8
2013-02-14 12:20:22 +01:00
Thomas Mueller
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
Thomas Mueller
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
Björn Schießle
45ed0c6010
if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's
2013-02-11 15:37:01 +01:00
Administrator
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
Frank Karlitschek
316807e0d3
Merge pull request #1624 from owncloud/singleselect
...
Split editable select code used for quota selection into a jquery plugin
2013-02-12 11:05:07 -08:00
Robin Appelman
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt
1ba44a3325
Merge pull request #1538 from raghunayyar/admin-password-toggle
...
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
Thomas Müller
800609aaeb
Merge pull request #1545 from owncloud/fix-oc_webroot
...
fixup oc_webroot correctly before and after setup
2013-02-09 03:27:22 -08:00
Bart Visscher
d5f98a82aa
fix-oc_webroot
2013-02-08 18:44:52 +01:00
raghunayyar
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
Jörn Friedrich Dreyer
43ffb5945c
attach handlers to document instead of filelist, minor whitespace cleanups
2013-02-08 11:05:56 +01:00
Tobias Ramforth
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
Bart Visscher
a82d18d2f8
Fill oc_webroot with the expected value
2013-02-07 21:13:57 +01:00
Bart Visscher
458ba4b55c
Fix disabling setup form on submit
2013-02-07 08:12:09 +01:00
Bart Visscher
c0b370f6cf
Define the variables that are expected to exist but won't be set in setup
2013-02-07 08:11:18 +01:00
Thomas Müller
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
raghunayyar
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
Robin Appelman
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Björn Schießle
9cd692a6d0
use the same tooltip as for the password field
2013-01-31 17:00:05 +01:00
Jörn Friedrich Dreyer
d7823adb07
attach to filelist which is present on .ready()
2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Michael Gapczynski
ed2ee8c411
Change file action text for files inside shared folders as well
2013-01-28 23:16:29 -05:00
Michael Gapczynski
ede7fccb00
Change file action text to 'Shared'
2013-01-28 23:13:38 -05:00
Jan-Christoph Borchardt
a78ae6a5cb
Merge branch 'master' into permanent-share-icons
2013-01-28 19:39:51 +01:00
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
Michael Gapczynski
31ebea0f6a
Permanently display shared status icons
2013-01-26 13:25:15 -05:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Thomas Tanghus
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
Lukas Reschke
ff4d62132a
This breaks the installation
...
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.
JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
Thomas Mueller
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Lukas Reschke
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
Lukas Reschke
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
Lukas Reschke
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Bernhard Posselt
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
Michael Gapczynski
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
Jörn Friedrich Dreyer
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
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer
fe4f056a23
use jQuery.parseJSON fallback for IE6/7/8
2013-01-02 17:13:23 +01:00
Jörn Friedrich Dreyer
4a7604daa2
remove , at end of js. IE8 chokes on this
2013-01-02 17:02:06 +01:00
Jörn Friedrich Dreyer
5b07e722cb
combine ie8 fix with debug check
2013-01-02 12:21:30 +01:00
Jörn Friedrich Dreyer
e998da06d1
fix broken console.log in ie8
2013-01-02 12:13:07 +01:00
Thomas Tanghus
c317da7814
multiSelect: Add sorting options.
2012-12-21 06:18:10 +01:00
Thomas Tanghus
689edc2534
multiSelect: Make sure up/down classes are removed on close.
2012-12-21 06:17:13 +01:00
Thomas Tanghus
63fa943a52
multiSelect: Don't force popup above if there's no room for it there.
2012-12-21 00:53:23 +01:00
Thomas Tanghus
73b186cc60
Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_multiSelect
2012-12-21 00:52:29 +01:00
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
Björn Schießle
3adfb91ad8
call the password input field by name
2012-12-18 13:40:19 +01:00
Björn Schießle
d873f0da35
autofocus to password input after clicking the checkbox; code restructured; debug output added
2012-12-18 13:39:52 +01:00
Björn Schießle
c457e15b20
some more usability improvements:
...
merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
2012-12-18 13:39:37 +01:00
Björn Schießle
1dd79cc8e1
set password for shared links when the user press enter and when he leaves the password field
2012-12-18 13:39:09 +01:00
Thomas Mueller
c938a4f791
feedback to the user while request is being processed
2012-12-12 12:34:28 +01:00
Thomas Mueller
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
Thomas Mueller
45074d5023
restoring feature to send sharing link via email
2012-12-10 18:41:08 +01:00
Jörn Friedrich Dreyer
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
Thomas Tanghus
6d643f9e74
multiSelect.js: Give each select a unique msid to prevent double adding in users.js
2012-12-04 21:21:54 +01:00
Thomas Tanghus
feeaaf2d29
multiSelect: Make sure last added entry is selected and some code cleanup.
2012-12-04 18:00:14 +01:00
Thomas Tanghus
daf452b4ba
Added some missing type checks.
2012-12-04 18:00:13 +01:00
Thomas Tanghus
9ddd754bce
Enhanced multiSelect jquery plugin.
2012-12-04 18:00:13 +01:00
Jörn Friedrich Dreyer
e72f95f643
merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay
2012-12-04 13:32:55 +01:00
Jörn Friedrich Dreyer
3e519945c3
replace minified infieldlabel with dcneiners version
2012-12-04 13:30:13 +01:00
Thomas Tanghus
5c9faf396a
Sharing: Fix false positived v. 2
2012-11-27 23:01:26 +01:00
Jörn Friedrich Dreyer
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
Arthur Schiwon
4c707d1b1f
remove debug output
2012-11-26 14:35:02 +01:00
Arthur Schiwon
e5ad774ab0
coding style
2012-11-26 14:34:51 +01:00
Arthur Schiwon
4764876192
check whether to join url with ? or &
2012-11-26 14:34:41 +01:00
Arthur Schiwon
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Thomas Müller
f3ae43d94a
Merge pull request #420 from libasys/bugfix-share
...
If you using the sharing by link the array monthNames don't exist and ca...
2012-11-17 14:47:24 -08:00
Thomas Müller
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
Thomas Tanghus
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
Bernhard Posselt
defdbe3c10
removed unneeded callback checks in routes_request that could potentially fail
2012-11-15 15:07:01 +01:00
Bernhard Posselt
25e4a071ef
fixed: this.routes_request is a deferred/promise
2012-11-15 15:01:21 +01:00
Bernhard Posselt
bf20021b62
instead of warning via popup, write to console.warn
2012-11-15 14:48:18 +01:00
Bernhard Posselt
ad87bc4645
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-15 14:48:18 +01:00
Bernhard Posselt
14d4af24a2
Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading"
...
This reverts commit 9b8375cf2c
.
2012-11-14 23:09:15 +01:00
Bernhard Posselt
9b8375cf2c
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-14 22:37:21 +01:00
libasys
493ae19bca
If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined!
2012-11-14 16:47:52 +01:00
Alessandro Cosentino
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
Thomas Tanghus
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
Alessandro Cosentino
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
Jörn Friedrich Dreyer
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
Jan-Christoph Borchardt
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
Jan-Christoph Borchardt
f50c043cfb
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-31 18:52:13 +01:00
Lukas Reschke
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Tanghus
3813ee78c3
Merge pull request #112 from libasys/Fix-strange-Isue-IE8
...
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
2012-10-31 06:16:13 -07:00
libasys
b095e32227
UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample
2012-10-31 09:42:26 +01:00
Jan-Christoph Borchardt
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Bart Visscher
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
Bernhard Posselt
c4b8bb1041
added old functions again to not break apps, but show a deprecation warning
2012-10-29 01:14:07 +01:00
Michael Gapczynski
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04:00
Michael Gapczynski
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
Jan-Christoph Borchardt
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
Jan-Christoph Borchardt
99ba05e766
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-28 16:48:30 +01:00
Jan-Christoph Borchardt
71435ac1cc
improve user menu
2012-10-28 16:47:25 +01:00
Björn Schießle
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
Bernhard Posselt
a6f3a570c6
dont resize content div with javascript but use css box-sizing to do it
2012-10-27 19:42:25 +02:00