Thomas Tanghus
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
Jenkins for ownCloud
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
Thomas Tanghus
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +01:00
Thomas Tanghus
290d0714df
Add routes for vcategory favorites.
2012-11-01 03:05:48 +01:00
Jenkins for ownCloud
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
Lukas Reschke
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Tanghus
3813ee78c3
Merge pull request #112 from libasys/Fix-strange-Isue-IE8
...
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
2012-10-31 06:16:13 -07:00
libasys
b095e32227
UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample
2012-10-31 09:42:26 +01:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Bart Visscher
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Bart Visscher
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
Bart Visscher
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
Bart Visscher
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Michael Gapczynski
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04:00
Michael Gapczynski
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
Björn Schießle
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
Georg Ehrke
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
Robin Appelman
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
Lukas Reschke
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
Lukas Reschke
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
.
2012-10-28 10:21:06 +01:00
Lukas Reschke
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Michael Gapczynski
fefc4e1707
Load all apps in core share ajax file for apps to register their share backends
2012-10-27 17:25:10 -04:00
Bart Visscher
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
Bart Visscher
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Jan-Christoph Borchardt
46871e9b2e
update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin
2012-10-26 21:47:05 +02:00
Thomas Müller
628c7ca9cf
closes #113
2012-10-26 21:18:03 +02:00
libasys
0cf1fef3fa
Fix for problems using for() function instead of $.each for arrays with IE8
2012-10-26 20:34:04 +02:00
Robin Appelman
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Thomas Tanghus
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
Lukas Reschke
ec613b589b
Fix not defined JS variables
2012-10-25 17:51:59 +02:00
Jenkins for ownCloud
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
Thomas Tanghus
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
Lukas Reschke
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
Jenkins for ownCloud
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
Lukas Reschke
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
Lukas Reschke
9185cd5dae
Remove uneeded vendor prefixes
2012-10-24 00:01:18 +02:00
Lukas Reschke
9c17aa41ed
Format CSS in a readable way
2012-10-24 00:00:58 +02:00
Lukas Reschke
4956380a89
Remove uneeded vendor prefixes
2012-10-23 23:56:15 +02:00
Lukas Reschke
dcb286855e
Format the CSS in a readable way...
2012-10-23 23:55:59 +02:00
Lukas Reschke
787994139b
Remove uneeded vendor prefixes
2012-10-23 23:55:17 +02:00
Lukas Reschke
badda69b89
Format the CSS in a readable way...
2012-10-23 23:54:39 +02:00
Lukas Reschke
b1150f6a7f
Urlencode the share URL
...
Fixes #63
2012-10-23 17:55:49 +02:00
Lukas Reschke
b66dd3ebef
Merge pull request #38 from scambra/datepicker-l10n
...
Translate Datepicker
2012-10-22 23:53:24 -07:00
Felix Moeller
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Thomas Tanghus
befdd6b63b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-23 06:23:03 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Thomas Tanghus
69cf89c5f6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-22 15:41:39 +02:00
Thomas Tanghus
273fdb7b64
Added type and callback arguments to most methods.
2012-10-22 15:40:08 +02:00
Jenkins for ownCloud
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Michael Gapczynski
699a484f42
Fix font family for textarea
2012-10-20 14:15:33 -04:00
Michael Gapczynski
dd58849aa0
Apply textbox CSS rules to textarea as well
2012-10-20 14:11:35 -04:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
scambra
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
Thomas Tanghus
03ff614265
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 02:27:04 +02:00
Thomas Tanghus
fdf3ec1027
Add wait state to category dialog while processing.
2012-10-19 02:25:39 +02:00
Thomas Tanghus
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
Jenkins for ownCloud
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
Thomas Tanghus
81536a81e3
More js updates for app/type in OCCategories
2012-10-19 00:39:09 +02:00
Thomas Tanghus
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +02:00
Thomas Tanghus
3b6cfe4977
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 00:17:28 +02:00
Thomas Tanghus
97c884c548
Updated category js for handling favorites and use post instead of get.
2012-10-19 00:09:07 +02:00
Thomas Tanghus
26719005a4
Added ajax files for favorite category handling.
2012-10-19 00:07:41 +02:00
Thomas Tanghus
f4fd4a5a52
Updated category ajax files to use type instead of app and add callCheck.
2012-10-19 00:06:18 +02:00
Thomas Müller
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jenkins for ownCloud
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
Thomas Müller
9f01cd05fb
Merge pull request #37 from scambra/js-interpolation-l10n
...
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Bart Visscher
a8d0f84829
Resetting the password should also invalidate the token login cookies
2012-10-17 17:26:12 +02:00
Bart Visscher
0a614429af
Change the lostpassword flow to a controller
2012-10-17 17:24:49 +02:00
Bart Visscher
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
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
scambra
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
scambra
ec253f1354
Use strftime to format date with translated month names
2012-10-16 20:19:35 +02:00
Jenkins for ownCloud
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
Lukas Reschke
3eb43c1fbe
Show a warning in the installer if .htaccess is not working
2012-10-15 23:25:15 +02:00
Michael Göhler
d7a4547482
avoid undefined index warning on login page
2012-10-15 20:37:52 +02:00
Lukas Reschke
842d6dad47
Remove space
2012-10-15 17:42:38 +02:00
Lukas Reschke
d33bec09fe
Verify password page for users
2012-10-15 17:42:38 +02:00
Lukas Reschke
c930ac9f88
Merge pull request #30 from visit1985/logonpage
...
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00
Michael Göhler
7095b3a083
extend logon page to display multiple error messages
2012-10-14 19:57:24 +02:00
Lukas Reschke
2c427f050e
Show a warning in the installer if no secure RNG is available
2012-10-14 17:18:30 +02:00
Lukas Reschke
99cd922b82
Doublehash the token to prevent timing attacks
2012-10-14 12:13:02 +02:00