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

7710 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lukas Reschke
f3971e659b Merge pull request #129 from fmms/checkstyle01 
Checkstyle
 2012-10-28 10:36:27 -07:00
Felix Moeller
5d640f9ae3 NoSpaceAfterComma 2012-10-28 18:28:16 +01:00
Felix Moeller
b7a02f0c93 NoSpaceAfterComma 
first in new branch
 2012-10-28 18:12:31 +01:00
Thomas Müller
2248fe9f3e disble breaking test cases for now 2012-10-28 16:33:11 +01:00
Robin Appelman
0fbb99690b properly replace fileaction icons with pngs when needed 2012-10-28 16:03:52 +01:00
Robin Appelman
6695b29053 fix running app tests 2012-10-28 16:03:52 +01:00
Robin Appelman
6bc156ba69 add svg mimetype to default htaccess 2012-10-28 16:03:52 +01:00
Georg Ehrke
4fd0514f0a don't move file into subdirectory if a file with the same name already exists (fixes #92) 2012-10-28 15:23:40 +01:00
Arthur Schiwon
be215a097a check if RUNTIME_NOAPPS is set before using it 2012-10-28 15:10:22 +01:00
Björn Schießle
f2f2b8ba3b added some visual feedback is password was set 2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831 set password if user leaves password field (issue #57) 2012-10-28 14:31:34 +01:00
Georg Ehrke
d7a6b09406 deny the usage of dots in database name 2012-10-28 14:11:41 +01:00
Arthur Schiwon
b8a48b55a3 make sure all filesystem apps are loaded when setupFS is proceeded, to make sure the emmited setup-hook is received. Fixes #89 2012-10-28 13:48:08 +01:00
Arthur Schiwon
5b9ba2e033 remove whitespaces, no code change 2012-10-28 13:48:08 +01:00
Bernhard Posselt
bf3dac05d1 added functions for printing escaped and unescaped values 2012-10-28 13:28:22 +01:00
Robin Appelman
fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00
Robin Appelman
d9ef6da2e4 code style 2012-10-28 12:47:42 +01:00
Jan-Christoph Borchardt
20e0432de8 add 3rdparty folder to gitignore 2012-10-28 12:19:52 +01:00
Georg Ehrke
a2bbc1b317 remove 3rdparty files 2012-10-28 10:48:08 +01:00
Lukas Reschke
5245e2b6be ->l expects two parameters 2012-10-28 10:33:18 +01:00