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
Georg Ehrke
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
Bart Visscher
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
Georg Ehrke
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
Michiel de Jong
fc536c3491
add htmlentities() call into login form
2012-05-18 16:12:49 +02:00
Georg Ehrke
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
Michael Gapczynski
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Bart Visscher
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
Bart Visscher
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
Michael Gapczynski
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
Georg Ehrke
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
Bart Visscher
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +02:00
Vitaly Kuznetsov
6f981738bb
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
2012-05-10 09:10:53 +00:00
Thomas Tanghus
27da29525a
Made the global settings icon accessable via keyboard.
...
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
Georg Ehrke
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
Frank Karlitschek
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +02:00
Georg Ehrke
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
Frank Karlitschek
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
Georg Ehrke
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
Georg Ehrke
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
Georg Ehrke
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
Robin Appelman
cfd0140e2f
fix 2 potential xss problems
2012-04-16 12:59:38 +02:00
Jan-Christoph Borchardt
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
Georg Ehrke
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
Jan-Christoph Borchardt
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
Georg Ehrke
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
Frank Karlitschek
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
Robin Appelman
d01b78a4b4
prevent an possible xss exploit
2012-04-01 00:55:49 +02:00
Georg Ehrke
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
Georg Ehrke
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
Arthur Schiwon
e2fd0bbf02
IE 8: fix appeareance of checkboxes on login and files pages
2012-03-29 18:32:25 +02:00
Georg Ehrke
ec40f69c9e
add error 403 site
2012-03-25 14:16:39 +02:00
Thomas Tanghus
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Bart Visscher
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
Robin Appelman
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00
Brice Maron
c0b011e714
Initialise hasOtherDB var when not true in installation
2011-10-14 18:04:50 +02:00
Jan-Christoph Borchardt
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
Marvin Thomas Rabe
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
Bart Visscher
e8c6252a4c
Move lostpassword to core dir
2011-10-03 20:44:01 +02:00
Marvin Thomas Rabe
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
Marvin Thomas Rabe
481a37fcf3
Show database only in advanced
2011-10-03 13:32:16 +02:00
Marvin Thomas Rabe
c943f48547
fixed link to password recovery. removed duplicated and unused code out of index.php.
2011-10-01 11:08:49 +02:00
Bart Visscher
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
Marvin Thomas Rabe
e2251a4b38
show typed in username when log in has failed
2011-09-30 20:27:31 +02:00
Marvin Thomas Rabe
0541728404
added text to localisation
2011-09-30 20:23:59 +02:00
Marvin Thomas Rabe
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
Jan-Christoph Borchardt
8d14c489eb
changed short description and styled unobtrusively
2011-09-28 17:14:37 +02:00
Bart Visscher
950d4e1da4
Move lostpassword code to own app
2011-09-26 21:17:26 +02:00
Bart Visscher
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Jan-Christoph Borchardt
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00
Jan-Christoph Borchardt
14bbd6f976
updated translations
2011-09-04 18:12:58 +02:00
Jan-Christoph Borchardt
a47f22a275
clarified what we do
2011-09-04 16:38:45 +02:00
Jan-Christoph Borchardt
2fed316efa
hid localhost field for SQLite
2011-09-04 15:03:25 +02:00
Jan-Christoph Borchardt
252bca5057
removed database table prefix choice, use oc_
2011-09-04 14:56:09 +02:00
Jan-Christoph Borchardt
5700d8d6b1
added labels for the other advanced fields, thanks to Elias Probst for the suggestion
2011-08-30 09:17:25 +02:00
Michael Gapczynski
427747abba
Cleanup in login templates and link to lost password reset
2011-08-29 15:01:05 -04:00
Michael Gapczynski
1c955606a1
Initial work on resetting forgotten passwords. It works, but still need to email a token to allow reset
2011-08-29 14:37:18 -04:00
Jan-Christoph Borchardt
897bc55d46
Revert "Style searchbox like other textboxes"
...
The search box style is a design decision, search boxes are always styled differently from other inputs.
This reverts commit 9d48ca75ff
.
2011-08-27 20:02:11 +02:00
Michael Gapczynski
9d48ca75ff
Style searchbox like other textboxes
2011-08-27 13:42:03 -04:00
Jan-Christoph Borchardt
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt
0db5c734bc
some header fixes
2011-08-19 22:53:07 +02:00
Frank Karlitschek
cb9fc6d901
make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff
2011-08-17 00:24:50 +02:00
Jan-Christoph Borchardt
4a52886728
updated why we do this
2011-08-15 17:02:26 +02:00
Jan-Christoph Borchardt
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
Jan-Christoph Borchardt
9be059aced
removed subnavigation code
2011-08-13 05:31:56 +02:00
Jan-Christoph Borchardt
b2768637d2
updated translations
2011-08-13 05:13:35 +02:00
Dawid Opis
8aac43c12b
fixed width for three database type buttons, more highlighted when selected
2011-08-11 19:50:44 +02:00
Jan-Christoph Borchardt
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
Dawid Opis
ef5e253bf5
changed radiobuttons to jQuery UI buttons (restyled) on installation page
2011-08-11 18:18:50 +02:00
Dawid Opis
952d88a28c
fixed mysql/sqlite selection labels in installation screen
2011-08-11 16:37:20 +02:00
Jan-Christoph Borchardt
a8cb411a92
restyle logout
2011-08-11 00:47:21 +02:00
Jan-Christoph Borchardt
05f3910718
moved search box directly to template
2011-08-10 22:56:55 +02:00
Jan-Christoph Borchardt
fbf86c6683
made sliding settings more awesome
2011-08-10 17:31:01 +02:00
Robin Appelman
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
Jan-Christoph Borchardt
74be4644ed
fixed some styling again, the dirty way
2011-08-09 23:34:10 +02:00
Jan-Christoph Borchardt
ec2dd5be3a
removed some autocompletion
2011-08-09 22:51:08 +02:00
Jan-Christoph Borchardt
9817b51c21
who took a <p> in here?
2011-08-09 22:48:19 +02:00
Jan-Christoph Borchardt
9e4fb257e3
proper advanced options
2011-08-09 22:43:58 +02:00
Jan-Christoph Borchardt
34529b1c35
removed required parameter again because of issues
2011-08-09 22:33:56 +02:00
Serge Martin
4e5b6f72c1
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-09 11:33:15 +02:00
Serge Martin
97462b018d
Merge MySQL and PostgreSQL input fields
2011-08-09 11:32:22 +02:00
Jan-Christoph Borchardt
44f3dfe771
added semantic meaning with header, nav and footer
2011-08-09 10:30:37 +02:00
Jan-Christoph Borchardt
8e3914bceb
moved installation form error reporting directly to the HTML
2011-08-09 10:13:19 +02:00
Jan-Christoph Borchardt
5ed1030dbf
fixed icons
2011-08-08 23:39:16 +02:00
Jan-Christoph Borchardt
16bb34cd94
settings are now AWESOME
2011-08-08 23:32:09 +02:00
Robin Appelman
d1d47eb5eb
do proper styling for settings pages
2011-08-08 22:38:42 +02:00
Robin Appelman
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
Jan-Christoph Borchardt
3b34cba4ae
first mediaplayer styling
2011-08-08 21:40:39 +02:00
Jan-Christoph Borchardt
ded97de891
removed excess code
2011-08-08 19:50:42 +02:00
Jan-Christoph Borchardt
c350301342
optimized CSS, fixed login header
2011-08-08 19:50:42 +02:00
Jan-Christoph Borchardt
4de7009014
removed gratuitous main div
2011-08-08 19:50:42 +02:00
Jan-Christoph Borchardt
8c1e100fe0
first fix of the installation form
2011-08-08 12:19:22 +02:00
Jan-Christoph Borchardt
c572de6276
hide log in button etc when form fields not filled
2011-08-08 11:46:39 +02:00
Jan-Christoph Borchardt
b1a369b49f
quick fix for public links, removed expiration date and styled correctly
2011-08-08 11:17:03 +02:00
Jan-Christoph Borchardt
51f74d021f
refactoring CSS part 1, input elements
2011-08-08 09:47:58 +02:00
Jan-Christoph Borchardt
41a4fa97b8
HTML5 form field placeholders
2011-08-08 09:05:16 +02:00
Serge Martin
3e8ae8636c
Add postgresql support
...
REVIEW: 102101
2011-08-07 21:06:53 +02:00
Frank Karlitschek
1dc3cb67fa
more improved error reporting
2011-08-06 23:31:38 +02:00
Jan-Christoph Borchardt
a84b00cefc
fixing old CSS and HTML, navigation before content
2011-08-03 05:19:17 +02:00
Jan-Christoph Borchardt
04b745d67a
compacted sidebar
2011-08-02 02:03:14 +02:00
Jan-Christoph Borchardt
ad45c78b44
pimped the search dropdown style a bit
2011-08-01 21:31:16 +02:00
Robin Appelman
ef22498c6f
some fixes for persistent playlists
2011-08-01 01:59:57 +02:00
Robin Appelman
5ef407d1c9
keyboard shortcuts for search results
2011-07-31 04:03:48 +02:00
Jan-Christoph Borchardt
d6faa89ed7
fix header on error page
2011-07-30 21:58:04 +02:00
Robin Appelman
d2d77b2a48
initial work on instant search
2011-07-30 18:05:20 +02:00
Jan-Christoph Borchardt
8426babab9
updated navigation subentry styling
2011-07-30 10:56:28 +02:00
Jakob Sack
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
Jakob Sack
2bfad189e7
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
...
Conflicts:
lib/base.php
lib/filestorage.php
2011-07-29 20:42:24 +02:00
Robin Appelman
d12d08e2f3
some more changes for navigation subentries
2011-07-29 19:43:06 +02:00
Michael Gapczynski
997e1f9743
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-07-29 12:26:30 -04:00
Michael Gapczynski
9f867abe75
Display subnavigation entries in user layout template
2011-07-29 12:25:57 -04:00
Robin Appelman
2781fdeed8
automatically replace svg images with png for browsers that dont support svg
2011-07-29 17:51:38 +02:00
Robin Appelman
dee7fb3b72
fix login header for ie
2011-07-29 17:51:38 +02:00
Jan-Christoph Borchardt
23f051ccd6
redesigned search box
2011-07-29 02:35:21 +02:00
Jan-Christoph Borchardt
c5bc345604
rewrote header in pure CSS, smaller, less obtrusive
2011-07-28 02:30:09 +02:00
Jakob Sack
2f807a3c7f
Delete requires in applications where possible
2011-07-27 19:25:49 +02:00
Robin Appelman
9950f06c59
Merge branch 'master' into interface
2011-07-22 00:28:17 +02:00
Robin Appelman
828a26c69e
dont load some javascript files multiply times
2011-07-22 00:24:25 +02:00
Robin Appelman
be6b5c8e77
some work on the updated interface
2011-07-21 22:01:55 +02:00
Jan-Christoph Borchardt
3fab6016f9
moved Remember login below password field
2011-07-20 16:11:39 +02:00
Bartek Przybylski
c5776fdae4
remember login added
2011-07-20 15:04:14 +02:00
Jan-Christoph Borchardt
01a9d916e7
mark active navigation subentry
2011-07-07 21:19:18 +02:00
Jan-Christoph Borchardt
39c56a6ed0
styled navigation subcategories
2011-07-06 20:13:21 +02:00
Jan-Christoph Borchardt
4e5eb4c23e
autofocus on the username field for setup & login
2011-07-06 19:43:24 +02:00
Jan-Christoph Borchardt
5165e5dfcf
removed search box from settings area
2011-07-06 19:36:41 +02:00
Jan-Christoph Borchardt
bea758271a
updated search box display
2011-07-06 19:31:16 +02:00
Jan-Christoph Borchardt
1eb19b63ad
reworded some bits in the setup
2011-07-06 19:03:27 +02:00
Robin Appelman
4d11e920be
provide an option to add custom elements to the header of templates
2011-06-24 18:02:19 +02:00
Kamil Domanski
2073d3b08e
fix 404
2011-06-23 23:47:46 +02:00
Jakob Sack
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00