Commit graph

11076 commits

Author SHA1 Message Date
Bart Visscher
52fba43297 Merge pull request #2708 from owncloud/dont_expose_installatio
Don't expose the server installation time
2013-04-04 00:48:55 -07:00
Bart Visscher
2f19629407 Merge pull request #2706 from owncloud/random_is_random_and_not_time
Use a more random source...
2013-04-04 00:48:21 -07:00
Bart Visscher
866221a012 Merge pull request #2707 from owncloud/remove_brainfucked_method
Use more random source
2013-04-04 00:46:24 -07:00
Lukas Reschke
877ff9358f Don't expose the server installation time 2013-04-04 01:33:18 +03:00
Lukas Reschke
37cb79155e *gnaaarf* 2013-04-04 01:27:13 +03:00
Jenkins for ownCloud
cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Lukas Reschke
6645a54cac Use random bytes instead of time
Thanks for the heads-up @VicDeo :-)
2013-04-04 01:05:44 +03:00
Arthur Schiwon
e75406e712 PostreSQL compatibility, fixes #2666 2013-04-03 23:56:59 +02:00
Lukas Reschke
ba7c0cf548 Use a more random source... 2013-04-04 00:56:34 +03:00
Jan-Christoph Borchardt
cd079e3421 group some selectors again 2013-04-03 20:06:26 +02:00
Bernhard Posselt
40627a05a8 Merge pull request #2694 from owncloud/fix_2690
Typo, fixes #2690
2013-04-03 10:23:34 -07:00
Jan-Christoph Borchardt
a35d869e15 add styles for disabled input fields 2013-04-03 18:45:03 +02:00
Jan-Christoph Borchardt
1c55b3a969 button selector cleanup 2013-04-03 17:55:31 +02:00
Arthur Schiwon
d44b649d2a Typo, fixes #2690 2013-04-03 17:52:34 +02:00
Jörn Friedrich Dreyer
7eef643600 Merge pull request #2594 from owncloud/fix_part_file_ignoring
Fix part file ignoring
2013-04-03 01:38:18 -07:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Bernhard Posselt
b316ae2610 Merge pull request #2651 from owncloud/print_unescaped-u
Unescape the update hint
2013-04-02 14:19:30 -07:00
Arthur Schiwon
e25c1f3130 port 22c8194cc8 2013-04-02 21:03:13 +02:00
Lukas Reschke
8000f9db74 Unescape the update hint
Fixes #2647
2013-04-02 16:39:21 +03:00
Jan-Christoph Borchardt
48afa39292 Merge pull request #2275 from owncloud/app-styles
CSS styles for applications to make a tree like layout easier
2013-04-02 04:24:06 -07:00
Arthur Schiwon
fe5c00a173 Key must use less then 767 bytes long 2013-04-02 12:06:40 +02:00
Jan-Christoph Borchardt
c94580ba29 revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal 2013-04-02 11:52:57 +02:00
Jenkins for ownCloud
29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jenkins for ownCloud
9e29d2845a [tx-robot] updated from transifex 2013-04-01 00:04:02 +02:00
Jan-Christoph Borchardt
f8e48955b9 Merge pull request #2576 from owncloud/fixing-2125-master
fixes #2125 - the warning is now displayed with a disabled button
2013-03-31 09:53:07 -07:00
Bernhard Posselt
0b39a143e5 Merge pull request #2620 from eMerzh/add_query_logs
Log DB Queries
2013-03-30 18:58:23 -07:00
Bernhard Posselt
ab40634f33 Merge pull request #2622 from Kondou-ger/add_missing_backticks
Add (two) missing backticks.
2013-03-30 18:53:22 -07:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
root
7f74f08808 Add missing backticks.
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
Brice Maron
63804f4153 Change logQuery from define() to OC::Config 2013-03-30 22:36:55 +01:00
Brice Maron
2b8cf4959a Log Queries when we add a log query flag 2013-03-30 17:40:46 +01:00
Thomas Tanghus
73dd54c962 Don't try to call a an array :-P 2013-03-30 16:35:13 +01:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Sam Tuke
14451bdaf0 Development snapshot;
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
2013-03-29 21:11:29 +01:00
raghunayyar
5dd1f7d764 Using max-width instead of width for filename. 2013-03-30 00:13:47 +05:30
Sam Tuke
3cbfacb439 Merge branch 'master' into files_encryption 2013-03-29 15:59:54 +01:00
Bernhard Posselt
86ac30c596 Merge pull request #2516 from kabum/master
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
Bernhard Posselt
66d7cc4c74 Merge pull request #2584 from mrtorrent/fix_instanceid_format
Fix instanceid format to prevent session loop
2013-03-29 07:26:07 -07:00
Bernhard Posselt
8ed9be5408 Merge pull request #2597 from kabum/lesslog
Make it possible to show less log entries again
2013-03-29 07:22:43 -07:00
Bernhard Posselt
7c0999bd27 Merge pull request #2448 from owncloud/userlist_available_groups
User list: Keep array of available groups. Should fix #873
2013-03-29 07:19:09 -07:00
Thomas Tanghus
a56abd3f9b Typehint and check $ids parameter. 2013-03-29 14:54:08 +01:00
Bart Visscher
ec980a8a25 Merge pull request #2585 from mrtorrent/fix_install_app_version_check
Fix install app version check
2013-03-29 05:38:58 -07:00
raghunayyar
024b60decc Adds a fixed width to the filename to prevent horizontal scroll. 2013-03-29 16:26:03 +05:30
Thomas Tanghus
d838a3b33f Allow purging multiple objects from category index table. 2013-03-29 05:51:41 +01:00
Jörn Friedrich Dreyer
7ecbaef16c use css browser switch instead of deprecated jquery browser detection 2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer
dac875eb9c '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-03-28 18:50:49 +01:00
Sam Tuke
ff6f52d5ec Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
Sam Tuke
9ecfd07f23 Added ajax scripts for setting pwd recovery preferences 2013-03-28 18:29:18 +01:00
Jörn Friedrich Dreyer
e31d74037a use local variable to walk DOM only once 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer
868d7b956d use === to compare empty string '' 2013-03-28 18:20:03 +01:00