Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
Lukas Reschke
|
d24326ecce
|
Updated style
|
2012-07-26 01:38:20 +02:00 |
Lukas Reschke
|
d425740dc2
|
Remove unused files
|
2012-07-26 01:19:46 +02:00 |
Lukas Reschke
|
1554d7a2c0
|
Check for admin user
|
2012-07-26 01:16:32 +02:00 |
Robin Appelman
|
b1010160b3
|
CSRF protection for eventsource
|
2012-07-22 16:37:49 +02:00 |
Georg Ehrke
|
f9d3388854
|
Merge branch 'master' into calendar_import
|
2012-07-21 17:37:10 +02:00 |
Bjoern Schiessle
|
20a174e71b
|
remove second "autocomplete" statement
|
2012-07-18 12:27:15 +02:00 |
Bjoern Schiessle
|
0ea29398c7
|
remember username and provide autocomplete feature
|
2012-07-18 12:22:30 +02:00 |
Georg Ehrke
|
5575493900
|
Merge branch 'master' into calendar_import
|
2012-07-11 10:47:30 +02:00 |
Jörn Friedrich Dreyer
|
e59a1806cf
|
remove superfluous ?> at the end of .php files (left out apps/*/templates)
|
2012-07-09 16:51:16 +02:00 |
Michael Gapczynski
|
90e4af312a
|
Fix time formatting for minutes, prepend 0 if minutes is less than 10
|
2012-07-06 16:38:54 -04:00 |
Georg Ehrke
|
657eef354a
|
Merge branch 'master' into calendar_import
|
2012-07-04 13:03:30 +02:00 |
Brice Maron
|
799e34acd4
|
Add slash to app url if not set fix oc-1169
|
2012-07-03 21:58:36 +00:00 |
Georg Ehrke
|
433d15d309
|
Merge branch 'master' into calendar_import
|
2012-06-30 12:50:26 +02:00 |
Michael Gapczynski
|
8e4832bd12
|
Prevent adding a duplicate to a multiselect
|
2012-06-29 16:44:08 -04:00 |
Michael Gapczynski
|
05cb94801a
|
Add new group to other user's group select forms
|
2012-06-29 16:29:58 -04:00 |
Georg Ehrke
|
4e53db3d9c
|
Merge branch 'master' into oc_error
|
2012-06-26 14:17:32 +02:00 |
Bjoern Schiessle
|
18d5420744
|
typo in js statement fixed
|
2012-06-26 10:35:19 +02:00 |
Sam Tuke
|
f374dae233
|
Added text ACS warning to admin's user settings page, and corresponding CSS styles
|
2012-06-25 18:04:10 +01:00 |
Georg Ehrke
|
a113ee9e9f
|
add x-webkit-speech to searchbox
|
2012-06-24 00:42:16 +02:00 |
Georg Ehrke
|
243f910ae4
|
Merge branch 'master' into oc_error
|
2012-06-22 21:37:03 +02:00 |
Brice Maron
|
df60d6d5d2
|
Fixes for multi app dir :
Url should be given as relative path (to webroot)
Correct link construction from js
|
2012-06-22 12:24:56 +02:00 |
Brice Maron
|
e5c56b2433
|
Merge branch 'master' into multi_app_dir
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
|
2012-06-21 17:15:35 +00:00 |
Bjoern Schiessle
|
34739b7ec5
|
use new sanitizeHTML() function
|
2012-06-21 13:57:18 +02:00 |
Georg Ehrke
|
ccacb6f918
|
Merge branch 'master' into oc_error
|
2012-06-19 11:30:18 +02:00 |
Florian Hülsmann
|
c3cd3f3571
|
CSS class headerAction -> header-action
|
2012-06-18 23:22:52 +02:00 |
Florian Hülsmann
|
0132b80282
|
added CSS class .headerAction
|
2012-06-18 23:18:32 +02:00 |
Georg Ehrke
|
6bd0a158f7
|
Merge branch 'master' into oc_error
|
2012-06-18 15:59:39 +02:00 |
Bart Visscher
|
2f00384b51
|
Use TemplateLayout functions for finding js and css files in minimizer
|
2012-06-18 15:40:48 +02:00 |
Georg Ehrke
|
e31c9a7b6f
|
Merge branch 'master' into oc_error
|
2012-06-18 14:34:49 +02:00 |
Florian Hülsmann
|
4a50c15a8e
|
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
|
2012-06-18 13:36:49 +02:00 |
Bart Visscher
|
617de811f7
|
Cache the minimized output also on the server
|
2012-06-18 11:11:46 +02:00 |
Georg Ehrke
|
06c610c2ee
|
Merge branch 'master' into oc_error
|
2012-06-17 08:36:33 +02:00 |
Bart Visscher
|
99a68abbd5
|
Add session_write_close to the minimizer
|
2012-06-16 20:52:10 +02:00 |
Georg Ehrke
|
2c8a61ae9c
|
Merge branch 'master' into oc_error
|
2012-06-15 20:48:37 +02:00 |
Brice Maron
|
4753cc3ebd
|
Merge branch 'master' into multi_app_dir
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
|
2012-06-14 21:16:59 +00:00 |
Thomas Tanghus
|
f0b87bc421
|
Make requesttoken global.
|
2012-06-14 18:13:01 +02:00 |
Michael Gapczynski
|
b5889d6ffe
|
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
|
2012-06-13 15:17:46 -04:00 |
Thomas Tanghus
|
89464721c7
|
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
|
2012-06-13 17:33:19 +02:00 |
Bjoern Schiessle
|
b9d5f510c3
|
urlencode link fort password reset (bug #970)
|
2012-06-13 17:22:28 +02:00 |
Lukas Reschke
|
6defbc7f4d
|
Removed some unessecary sanitizations
|
2012-06-11 19:20:48 +02:00 |
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
Georg Ehrke
|
82abbed883
|
Merge branch 'master' into oc_error
|
2012-06-10 18:38:38 +02:00 |
Robin Appelman
|
cfe219fbb9
|
fix potential xss in multiselect
|
2012-06-09 15:07:16 +02:00 |
Georg Ehrke
|
f43fd1765e
|
fix merge conflicts
|
2012-06-08 11:23:58 +02:00 |
Bart Visscher
|
4260dce826
|
Better handling of core.css and core.js
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
|
2012-06-07 21:35:40 +02:00 |
Brice Maron
|
cf02f3c107
|
Merge branch 'master' into multi_app_dir
|
2012-06-07 19:11:55 +00:00 |
Michael Gapczynski
|
3c3a2b9b27
|
Remove old internal mail call for password reset, fixes bug oc-934
|
2012-06-07 09:25:50 -04:00 |
Brice Maron
|
5c2b2fc842
|
Change app path logic in templates
|
2012-06-06 20:24:16 +00:00 |
Brice Maron
|
cc494259d3
|
Unit path and webpath, correct some more
|
2012-06-06 20:24:15 +00:00 |