mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,124 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

8124 Commits

Author SHA1 Message Date
Felix Moeller 9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +01:00
Felix Moeller 27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
Felix Moeller bc4382c5c5 Checkstyle: fix the last NoSpaceAfterEquals 2012-11-04 18:31:44 +01:00
Felix Moeller 0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller 1205749f8c Checkstyle: Fix the last two SpaceBeforeOpenBrace 2012-11-04 18:18:03 +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
Lukas Reschke 80b9854710 Remove uneeded debug output 2012-11-04 14:26:45 +01:00
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
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +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
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 d2e842fcc9 Remove uneeded new line 2012-11-01 22:38:21 +01:00
Lukas Reschke 822e4d5f6c Check for redirect_url for logged in users 
This checks if there is a redirect_url for logged in users
 2012-11-01 22:37:37 +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
Lukas Reschke 81f019b6c5 Make the redirect_url working again 
Fixes #160
 2012-10-31 22:03:55 +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