wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7530 commits 157 branches 562 tags 714 MiB
Commit graph

7530 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
blizzz
ad86ce9fcb Merge pull request #141 from denis-b/patch-1 
fix dirnames containing "+" not displayed
 2012-10-29 09:06:14 -07:00
denis-b
2aa5a185d4 Update apps/files/ajax/move.php 
fix moving dirs containing "+"
 2012-10-29 16:46:22 +01:00
denis-b
b563935498 Update apps/files/index.php 
fix dirnames containing "+" not displayed
 2012-10-29 16:44:50 +01:00
Lukas Reschke
ac784baef6 Generate only one CSRF token 2012-10-29 16:35:29 +01:00
Lukas Reschke
4d61eb3e4c Fix a typo 2012-10-29 16:33:39 +01:00
Bart Visscher
ccbf4e993c Use files remote webdav in compatibility files/webdav.php 2012-10-29 15:04:56 +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
Bart Visscher
ab4ade0d24 Remove fixme, problem is solved already 2012-10-29 15:04:55 +01:00
Bart Visscher
40fe6c6346 Remove subnavigation key, not used 2012-10-29 15:04:55 +01:00
Bart Visscher
4d03b3dbaf Add ETag caching for Javascript routes 2012-10-29 15:04:55 +01:00
Bart Visscher
a7806076b1 Move generating cache key from files from OC_Minimizer to OC_Cache 2012-10-29 15:04:55 +01:00
scambra
1f0bc1713f fix settings routes 2012-10-29 14:50:03 +01:00
Michael Gapczynski
5aec26a37c Fix MySQL install, bug fix for issue 132 2012-10-28 19:50:26 -04:00
Michael Gapczynski
a6e18e0b6d Check if error_report() is equal to 0, so suppressed errors aren't logged e.g. the htaccesstext.txt fopen failing 2012-10-28 19:38:57 -04:00
Jenkins for ownCloud
dbb4e74c79 [tx-robot] updated from transifex 2012-10-29 00:02:45 +01:00
Felix Moeller
dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +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