2795 Commits

Author SHA1 Message Date
Nick Daly
a9c853e5bd Merged with upstream. 2013-10-06 21:21:43 -05:00
Nick Daly
04d9abfba6 Updated Makefile to reflect Apache config changes. 2013-10-06 21:17:18 -05:00
Nick Daly
c61e73245a Made URLs less absolute. 2013-10-06 21:11:08 -05:00
Nick Daly
54313fcb35 Update Plinth to handle new Apache config:
- Remove custom https redirect code.
- Hang Plinth off of any directory.
2013-10-06 21:04:29 -05:00
Nick Daly
4f2cb54f32 Updated Apache config to be a little more flexible. 2013-10-06 21:00:06 -05:00
Nick Daly
721fca19fc Remove support directory. 2013-10-06 17:30:37 -05:00
James Valleroy
41d57cc5fc Put quotes around variables in action scripts. 2013-10-05 18:16:55 -04:00
Nick Daly
5de7ecc99b Configure Apache by default. 2013-10-05 14:54:53 -05:00
Nick Daly
f11a97e060 Add Apache configs. 2013-10-05 14:38:00 -05:00
Nick Daly
63045d1928 Redirect all requests to HTTPS. 2013-10-05 14:36:07 -05:00
James Valleroy
17f3965db8 Added XMPP settings form with control of in-band registration. 2013-10-03 19:48:57 -04:00
James Valleroy
349517339d Check output of XMPP account registration. 2013-10-03 06:16:37 -04:00
James Valleroy
2fd1d6e7b2 Added action to register xmpp account. 2013-09-29 23:00:54 -04:00
James Valleroy
d0157e09ab Non-functional XMPP account registration form. 2013-09-29 22:28:26 -04:00
Nick Daly
eee02c0ca1 Merge pull request #34 from jvalleroy/bugfixes
Bugfixes
2013-09-29 13:03:59 -07:00
James Valleroy
cda21f395f Fix to avoid python error about non-ASCII character. 2013-09-28 18:06:03 -04:00
James Valleroy
4048e77738 Fixes for plinth.config when run from source folder. 2013-09-28 18:04:53 -04:00
Nick Daly
6c988755ac Merge pull request #30 from petterreinholdtsen/do-not-clean-vendor-destdir
Avoid removing vendor and $(DESTDIR).
2013-09-28 10:49:16 -07:00
Nick Daly
d722ca950f Merge pull request #31 from petterreinholdtsen/app-owncloud
Add support for owncloud in the apps menu
2013-09-28 10:48:39 -07:00
Nick Daly
f69549c480 Merge pull request #27 from petterreinholdtsen/forms-radio-buttons
Add support for radio buttons.
2013-09-28 10:46:32 -07:00
Nick Daly
6758aa0d36 Merge pull request #33 from petterreinholdtsen/handle-unknown-users
Make sure login do not throw exception for unknown users.
2013-09-28 10:33:48 -07:00
Petter Reinholdtsen
6630a8f3d5 Make sure login do not throw exception for unknown users. 2013-09-26 20:04:27 +02:00
Petter Reinholdtsen
7b9f6e09d3 Make sure apt do not ask questions when installing owncloud. 2013-09-26 13:26:21 +02:00
Petter Reinholdtsen
829e40198d Get owncloud enabling limping along. 2013-09-26 11:34:04 +02:00
Petter Reinholdtsen
55bf19865a Avoid removing vendor and $(DESTDIR).
The vendor/ directory contain source used during build, and
$(DESTDIR) might point to /usr/.  Neither should be removed
in the clean target.
2013-09-25 11:23:51 +02:00
Petter Reinholdtsen
fe33c348b4 First draft to add owncloud support. 2013-09-23 15:18:53 +02:00
Petter Reinholdtsen
444365ec78 Rewrite plinth to use sudo and action scripts instead of exmachina for privileged accesss. 2013-09-23 09:37:24 +02:00
Petter Reinholdtsen
3c78b92d04 Add support for radio buttons. 2013-09-19 12:35:16 +02:00
Nick Daly
0954d9d383 Merge pull request #17 from petterreinholdtsen/first-boot-create-user
Create admin user on first boot.
2013-09-17 19:59:19 -07:00
Petter Reinholdtsen
f24d1fb94d Merge branch 'master' into first-boot-create-user
Resolve conflicts in modules/installed/first_boot.py.
2013-09-16 05:27:57 +02:00
Nick Daly
c99f074f22 Use ExMachina already in Plinth/vendor. 2013-09-15 21:55:23 -05:00
Nick Daly
87753531d2 Reverted change 657068b0. 2013-09-15 21:47:18 -05:00
Nick Daly
b71e832683 Merged Petter's unify-ExMachina-and-Plinth changes. 2013-09-15 21:40:23 -05:00
Nick Daly
5002715cb6 Merge pull request #24 from petterreinholdtsen/first-boot-no-dead-end
Provide a way to get out of the first-boot screen, even if it isn't read...
2013-09-15 17:48:30 -07:00
Nick Daly
32a86a54b5 Merge pull request #19 from petterreinholdtsen/first-boot-set-hostname
Change first_boot module to show and update current hostname,
2013-09-15 17:43:31 -07:00
Nick Daly
60fa9b0ee0 Merge pull request #18 from petterreinholdtsen/find-exmachina-client-library
Fix typo blocking access to exmachina, and report the problem if unable ...
2013-09-15 16:11:59 -07:00
Nick Daly
4c42c1ad1f Merge pull request #20 from petterreinholdtsen/expert-user-access
Fix expert user access checks.
2013-09-15 16:11:18 -07:00
Nick Daly
702bc2292b Merge pull request #21 from petterreinholdtsen/nonexpert-config-feedback
Give sensible feedback for non-expert users visiting system/configure.
2013-09-15 16:10:27 -07:00
Nick Daly
04a266729e Merge pull request #22 from p1otr/master
use stdlib's json module if simplejson is missing
2013-09-15 16:09:58 -07:00
Nick Daly
b6b1119534 Merge pull request #25 from jvalleroy/fix-login
Enable multithread for UserStore DB.
2013-09-15 16:05:32 -07:00
Petter Reinholdtsen
8cd1d23e1e Improve message shown to the users. 2013-09-13 10:04:50 +02:00
James Valleroy
5be8a552ab Enable multithread for UserStore DB. 2013-09-12 23:14:07 -04:00
Petter Reinholdtsen
023325fdde Provide a way to get out of the first-boot screen, even if it isn't ready yet. 2013-09-13 00:00:17 +02:00
Petter Reinholdtsen
6409552e70 Fix exmachine import. 2013-09-12 12:58:39 +02:00
Petter Reinholdtsen
657068b026 Import exmachina into plint, using source from Tom Galloway. 2013-09-12 11:05:08 +02:00
Petter Reinholdtsen
7ff6ea14e2 Rewrite fix for UserStore.expert() to be more like UserStoreOld.expert(). 2013-09-11 20:31:12 +02:00
Petter Reinholdtsen
1615b7818b Give sensible feedback for non-expert users visiting system/configure.
Explain that only expert users get access, instead of only showing
an title.
2013-09-11 20:13:46 +02:00
Petter Reinholdtsen
6effc94349 Fix expert user access checks.
Several places in the code, cfg.users.expert() is used as a boolean
test to see if the current user is an expert user.  But this do not work.
Change the implementation of expert() to assume the current user if no
argument is given, to get the code working.
2013-09-11 20:11:56 +02:00
Petter Reinholdtsen
71873b6702 Change first_boot module to show and update current hostname,
instead of showing the box_name value and failing to set anything
when the user specify a host name value.
2013-09-11 14:04:34 +02:00
Petter Reinholdtsen
bad8939389 Fix typo blocking access to exmachina, and report the problem if unable to load the exmachina client library. 2013-09-11 13:46:37 +02:00