mirrors/nextcloud-server
3
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-10-26 19:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,555 Commits 696 Branches 1,154 Tags 27 GiB
88b91a7304
Commit Graph

7555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Tanghus
88b91a7304 Swap expected and actual. 2012-11-04 12:33:32 +01: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
8e5b6bf21d VCategories: Make $categories non-static again. 2012-11-04 12:24:49 +01:00
Thomas Tanghus
7c67d2fdd6 VCategories: Swap expected and actual in unit tests. 2012-11-04 12:09:54 +01:00
Thomas Tanghus
4648dcfa46 VCategories: Use correct variable. 2012-11-04 12:09:04 +01:00
Jenkins for ownCloud
17d466b03b [tx-robot] updated from transifex 2012-11-04 00:01:42 +01:00
Robin Appelman
4c0c78d15d check for filename blacklist in OC_Filesystem::isValidPath 2012-11-03 00:26:36 +01:00
Robin Appelman
503922ff6c some tests for the file blacklist 2012-11-03 00:26:36 +01:00
Jenkins for ownCloud
2f0fd84477 [tx-robot] updated from transifex 2012-11-03 00:02:24 +01:00
Lukas Reschke
fd584f446d Merge pull request #220 from fmms/checkstyle02 
Checkstyle: many fixes
 2012-11-02 14:59:36 -07:00
Robin Appelman
2dbf2c69de fix inlude path for template test 2012-11-02 21:46:27 +01:00
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
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
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
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