Robin Appelman
a1c37d4be5
fix OC_Filesystem::isValidPath when using \ instead of / in paths
2012-11-02 19:56:34 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Arthur Schiwon
df8c67721d
code style
2012-11-02 09:42:10 +01:00
Lukas Reschke
d9e9761099
Fix a typo
2012-11-02 00:16:40 +01:00
Lukas Reschke
0f02b7dea6
Add CSRF token
2012-11-02 00:09:28 +01:00
Jenkins for ownCloud
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
Lukas Reschke
5db2f42189
Merge pull request #203 from owncloud/wording-url-link
...
Files: change wording 'From url' to 'From link'
2012-11-01 10:45:17 -07:00
Jan-Christoph Borchardt
e66482430e
Files: change wording 'From url' to 'From link'
2012-11-01 18:09:16 +01:00
Arthur Schiwon
5252fc52ed
LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194
2012-11-01 16:48:17 +01:00
Robin Appelman
553b1072b6
fix archive tar include path
2012-11-01 16:15:25 +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
Björn Schießle
a9ce43de41
adapted comments to the code changes
2012-11-01 00:20:50 +01:00
Björn Schießle
3878950af4
load logging apps for webdav connections
...
Backport of de1b95c
2012-11-01 00:20:43 +01:00
Jenkins for ownCloud
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
Thomas Tanghus
8509ca257f
Switch expectation and result in unit tests.
2012-10-31 21:24:03 +01:00
Thomas Tanghus
8cffbb5f7d
Added some more error checking on db queries.
2012-10-31 20:47:04 +01:00
Thomas Tanghus
8fc0f53a48
Added unit tests for OC_VCategories.
2012-10-31 20:07:28 +01:00
Thomas Tanghus
5a738380f6
Cast object ids to integers.
2012-10-31 20:06:39 +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
b434c20c18
Added unit test testinsertIfNotExistDontOverwrite.
2012-10-31 16:51:36 +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
Jörn Friedrich Dreyer
b76306c144
Merge pull request #155 from owncloud/token-expired-IE
...
Send the requesttoken as form value
2012-10-31 04:50:18 -07:00
Thomas Müller
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -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
Thomas Mueller
dca80c55a9
fixing Test_TemplateFunctions
2012-10-31 00:22:26 +01:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Thomas Müller
d5643adaa5
Merge pull request #146 from Raydiation/master
...
Tests for p and print_unescaped added
2012-10-30 14:55:44 -07:00
Bernhard Posselt
3ca5927b59
fixed copy paste error. 4th test will now test print_unescaped instead of p
2012-10-30 21:20:21 +01:00
Bart Visscher
6d09752940
DRY for creating htaccess to protect data-directory
2012-10-30 20:57:19 +01:00
Bart Visscher
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
Lukas Reschke
6738275b01
Merge pull request #153 from butonic/master
...
check for database error in userExists
2012-10-30 10:17:39 -07:00
Bernhard Posselt
aef3c6010b
splitted two tests with two assertions each into four tests with one assertion
2012-10-30 17:30:39 +01:00
Lukas Reschke
116fa64294
Change IE8 to "older IE versions"
...
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
Lukas Reschke
ee1e4a7602
Send the requesttoken as form value
...
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.
Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
scambra
5af8adc169
code style changes
2012-10-30 12:17:15 +01:00
Jörn Friedrich Dreyer
b032819ab9
check for database error in userExists
2012-10-30 11:08:32 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +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
Sam Tuke
3fdf239b47
Merge pull request #147 from owncloud/htaccess-upgrade-check
...
Generate .htaccess when upgrading from old versions
2012-10-29 16:28:46 -07:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Bart Visscher
9318a9566a
Merge pull request #136 from scambra/users-fixes
...
fix settings' routes
2012-10-29 15:31:37 -07:00
Lukas Reschke
f6b6780072
Don't use OC_Setup as it will show up the installer
2012-10-29 22:44:49 +01:00
Lukas Reschke
6903475841
Generate .htaccess when upgrading from old versions
...
When upgrading from old ownCloud versions like 2.x the .htaccess is not
generated - which exposes the data to the internet. This fix will
generate a .htaccess when upgrading. (And no one exists)
Fixes #127
2012-10-29 22:03:18 +01:00
Bernhard Posselt
f591382147
assert in proper order
2012-10-29 21:33:43 +01:00
Bernhard Posselt
a31c230f22
added tests for p and print_unescaped
2012-10-29 21:22:53 +01:00
Lukas Reschke
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
blizzz
629d33967c
Merge pull request #142 from denis-b/patch-2
...
fix moving (in) dirs containing "+"
2012-10-29 09:25:09 -07:00
