Thomas Tanghus
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
Bart Visscher
7b53c9d3f0
Merge pull request #157 from owncloud/setup
...
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus
fd709fc021
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-11 20:20:09 +01:00
Jenkins for ownCloud
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Jenkins for ownCloud
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Jenkins for ownCloud
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
Thomas Tanghus
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
Alessandro Cosentino
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
Jörn Friedrich Dreyer
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
Thomas Müller
8f0269f121
Merge pull request #265 from owncloud/fix-button-img-cursor
...
make images in buttons also show click-hand on hover
2012-11-05 15:15:56 -08:00
Thomas Tanghus
73d59bd397
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-06 00:10:45 +01:00
Jenkins for ownCloud
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
Jan-Christoph Borchardt
1aec5378b8
make images in buttons also show click-hand on hover
2012-11-05 19:54:48 +01:00
Thomas Tanghus
be77d81152
VCategories: Closing brace must be on a line by itself.
2012-11-05 16:38:23 +01:00
Thomas Tanghus
8c492a86fc
VCategories: Line too long.
2012-11-05 16:35:25 +01:00
Thomas Tanghus
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
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
