Commit graph

2137 commits

Author SHA1 Message Date
Thomas Tanghus
1803260285 Renamed OC_VCategories::add() to addMulti() and let the add() method return the id of the newly created category. 2012-10-19 13:21:05 +02:00
Thomas Tanghus
0e4ed2887c Return result from OC_DB::insertIfNotExist(). 2012-10-19 13:20:08 +02:00
Thomas Tanghus
afa3f49c93 Make categories var static. 2012-10-19 02:26:36 +02:00
Thomas Tanghus
4827de4a27 White space fix. 2012-10-19 00:20:27 +02:00
Thomas Tanghus
3b6cfe4977 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-19 00:17:28 +02:00
Thomas Tanghus
8a777022e4 Formatting 2012-10-19 00:16:53 +02:00
Thomas Tanghus
09e26145b7 Add favorite handling methods to OC_VCategories. 2012-10-19 00:15:58 +02:00
Thomas Tanghus
1f7baeb974 Use consts all places and rename some daft method names. 2012-10-19 00:13:34 +02:00
Björn Schießle
08ee2fcf93 check if mount point was already loaded to avoid redundant read operations 2012-10-18 17:30:01 +02:00
Björn Schießle
65b0824d35 typo from previous commit fixed 2012-10-18 17:15:30 +02:00
Björn Schießle
2499c24b8b load system wide configured mount points before accessing shared files 2012-10-18 17:15:30 +02:00
Björn Schießle
00ed2e87c9 check for mount points if file was shared from a different user 2012-10-18 17:15:30 +02:00
Thomas Müller
e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
a7d8519550 when using oracle use LOWER() to make searching files case insensitive 2012-10-18 14:19:34 +02:00
Thomas Tanghus
26e92094a6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 12:30:14 +02:00
Bart Visscher
04824162d9 core.js and core.css don't need to be absolute 2012-10-17 10:52:16 +02:00
Thomas Tanghus
8cd268fc82 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 00:16:37 +02:00
Jenkins for ownCloud
fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
Michael Gapczynski
c00f5d164f Fix unshareAll() 2012-10-16 16:27:23 -04:00
Lukas Reschke
379b775a56 Delete user files in /data/ after deleting a user 2012-10-16 22:05:06 +02:00
Michael Gapczynski
012ea1ed83 Add unshareAll() function to Share API 2012-10-16 15:38:52 -04:00
icewind1991
247626b5c2 Merge pull request #36 from scambra/filecache-fixes
delete fscache on deleting user
2012-10-16 11:46:50 -07:00
scambra
d8eb62232e don't duplicate locales with country code 2012-10-16 20:31:46 +02:00
scambra
ec253f1354 Use strftime to format date with translated month names 2012-10-16 20:19:35 +02:00
Lukas Reschke
de7b46c66a Use get_magic_quotes_gpc() to determine if magic_quotes is enabled
set_magic_quotes_runtime gives a PHP warning
2012-10-16 19:42:17 +02:00
scambra
e8441becdb delete fscache on deleting user 2012-10-16 17:34:35 +02:00
Thomas Tanghus
102dd1242e Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-16 16:57:25 +02:00
Lukas Reschke
e7c9d5fe54 Set oc_token to httponly 2012-10-16 13:53:40 +02:00
Lukas Reschke
59404b5675 Merge pull request #31 from visit1985/persistentcookies
reresubmit: improved persistent cookies :)
2012-10-16 04:46:22 -07:00
Lukas Reschke
e299c241df Make enhanced auth configurable 2012-10-16 01:08:05 +02:00
Lukas Reschke
c85c35dfae Don't add the enhanced auth time to the configuration 2012-10-16 01:04:34 +02:00
Lukas Reschke
5c0407306c Set a standard value for enhanced auth time 2012-10-16 01:04:20 +02:00
Lukas Reschke
6f2e8788ca Make enhanced auth time configurable 2012-10-16 01:02:03 +02:00
Lukas Reschke
f4142bd2a8 Move isUserVerified to OC_Util 2012-10-16 00:47:38 +02:00
Lukas Reschke
77e18b01ba Move the ( to the right position 2012-10-16 00:47:38 +02:00
Lukas Reschke
91d4b23efe Fix PHP notice 2012-10-16 00:47:38 +02:00
Lukas Reschke
1a187d1ca5 Fix PHP notice 2012-10-16 00:47:38 +02:00
Lukas Reschke
097f429816 Add isUserVerified() 2012-10-16 00:47:38 +02:00
Victor Dubiniuk
ddcd738357 Merge branch 'extended_log'
PHP errors logging into the owncloud log
2012-10-16 01:30:45 +03:00
Lukas Reschke
c9ac1364d1 "deny from all" instead directory 2012-10-15 23:35:27 +02:00
Lukas Reschke
3eb43c1fbe Show a warning in the installer if .htaccess is not working 2012-10-15 23:25:15 +02:00
Thomas Tanghus
9c9f5ef2d6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-15 21:41:38 +02:00
Michael Göhler
8be9c04a3a 128byte is not 128bit - now we realy use 256bit (same as PHPSESSID) 2012-10-15 20:04:22 +02:00
Lukas Reschke
fa71e51e67 Use /dev/urandom instead of /dev/random
The usage of /dev/urandom is enough secure
2012-10-15 19:21:37 +02:00
Lukas Reschke
6e045b9ea1 Check if $_Post 2012-10-15 17:42:38 +02:00
Lukas Reschke
1c865f702c Change verifyUser so that external json files can call it 2012-10-15 17:42:38 +02:00
Lukas Reschke
4d7b0e9bb3 verifyUser() for the json part 2012-10-15 17:42:38 +02:00
Lukas Reschke
d33bec09fe Verify password page for users 2012-10-15 17:42:38 +02:00
Lukas Reschke
f08ff3b6e6 Correct formatting 2012-10-15 15:25:40 +03:00
Lukas Reschke
c930ac9f88 Merge pull request #30 from visit1985/logonpage
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00